Merge OrbisGIS H2 with master