Manually merged in #1619, correcting the issues.
Re-enabled Geomap KML examples.
Merge pull request #1639 from pjackson28/master

Fixed Geomap KML handling