Better stash system for locale
Merge remote-tracking branch 'origin/master'