Add locale setting
Merge branch 'master' into work-separate-boxen