Manual merge of Pull Request #228 via @gilesc50 (Changed OpenSpace gazetteer call to return all towns and cities found, rather than just the first one)
Partial manual merge of Pull Request #230 via @gilesc50 but should really have been part of Pull Request #228 (Manual merge of Pull Request #228 via @gilesc50 (Changed OpenSpace gazetteer call to return all towns and cities found, rather than just the first one)
Merge branch 'release-2.1' of github.com:mapstraction/mxn into htmlmarkers