Merge branch 'hotfix/2013-12.1.1'
Fixed translations
Merge branch 'hotfix/2013-12.1.2' into develop