Add new country API, refs #371.
Merge fixes
tag
remove unused imports
Merge branch '1.1.x', added new country API.
Introduce a test helper function to the locate tests.
Add some more low-level tests for country variant of locate functionality.