locale changes
Merge remote-tracking branch 'upstream/master'
Merge pull request #258 from Rakeshadlagatta/master

locale changes