Merge branch 'maint' of git://github.com/git-l10n/git-po into maint