Fixes for Xcode 5.1.
Merge branch 'develop' of git+ssh://github.com/mousebird/WhirlyGlobe into develop