merge upstream/develop

conflict:
WhirlyGlobeSrc/WhirlyGlobe-MaplyComponent/src/MaplyVectorMarkerStyle.mm