Merge branch 'va/i18n_2' into pu
authorPat Thoyts <patthoyts@users.sourceforge.net>
Mon, 3 Oct 2016 22:40:50 +0000 (23:40 +0100)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Mon, 3 Oct 2016 22:40:50 +0000 (23:40 +0100)
Trivial merge