Add new country API, refs #371.
Merge fixes
tag
remove unused imports
Merge branch '1.1.x', added new country API.