Merge branch 'va/i18n_2' into pu

Pat Thoyts committed Oct 3, 2016 at 23:40 UTC 52f2445d5c70a204f614fd83cf98a27359dff04c

No changes.