Use the en-us locale for functional tests
Merge branch 'master' into py3k