I fought the code and the code won
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop
> 1!