Merge tag 'l10n-2.18.0-rnd3' of git://github.com/git-l10n/git-po