updated
Fixed locales
Merge branch 'master' into release