Changed some citizenship-names to the more commonly used ones
Merge branch 'release/1.2'