Merge branch 'master' into locales
Update locales, adds Russian support
Merge remote-tracking branch 'upstream/master' into locales
Merge pull request #122 from robotmay/locales

Updating to latest locales, add Russian support