manual merge of bug fix mousebird/WhirlyGlobe@b3098fab5e61f03ebb035bf1d4a37acdc699beb7