merge branch 'milestone25_i18n' into 'dev' #440

Closed rezzo closed 9 years ago