Propagate the locale variable
Merge branch 'master' into new_romie