Merge remote-tracking branch 'winterfairy/feature/import-translations' into devel