Merge branch 'OpenGIS'