small bug fix in setting of locale
Merge branch 'origin/master'