Merge remote-tracking branch 'remotes/upstream/master' into geometryEditors

Conflicts:
	h2spatial-ext/src/main/java/org/h2gis/h2spatialext/CreateSpatialExtension.java
	h2spatial-ext/src/test/java/org/h2gis/h2spatialext/SpatialFunctionTest.java