Fix merge_geometry option handling
Merge branch 'topic-postgis3D' of https://github.com/Oslandia/osgearth into topic-postgis3D