Redo locales and include in all builds
Merge remote-tracking branch 'origin/kitkat' into blood