Merge master branch for tracking l10n updates of next release