Add locale to filenames.
Merge branch 'master' into revision-same