Syncing with master. Forgot locale files (2)