vanilla/vanilla — pull request #2060 by hgtonight (2014-09-03 14:46:47+00:00)
Title: Refresh locale mapping after application enable

This is a cleaner PR and submitted against 2.1

Closes #1779