Fix gettering current locale information
Merge branch '2.0'