Workaround lack of support for @ character in locales
Add correct codes for Serbia
Merge pull request #849 from danielhjames/master

Workaround lack of support for @ character in locales