Merge maint branch for tracking l10n updates of git stable version