Fix style problems
Merge branch 'master' into bare-geometry
Multipolygon support. Fixes #336