Merge branch 'va/i18n' into pu

Pat Thoyts committed Oct 3, 2016 at 23:23 UTC 64c6b4c507c0295dbd54b0981510a5a8fff71947

No changes.