Fixed locale setting
Merge remote-tracking branch 'msoida/master'