Merge branch 'master' into translation
l10n: Import translations.