Add locale.gen and timezone
Merge branch 'master' into Jdeapad