Add env.d/locale
Merge branch 'master' into Jdeapad