Merge pull request #2846 from Montellese/multi_language_addons