Merge branch 'theme-translation' into 'master'