  	<!-- ====================================================================== -->
  	<xs:element name="NavigableSpace" type="NavigableSpaceType" substitutionGroup="IndoorCore:CellSpace">
  		<xs:annotation>
+diff -urN ../resources-original/ogc/ols/1.1.0/ADT.xsd ogc/ols/1.1.0/ADT.xsd
+--- ../resources-original/ogc/ols/1.1.0/ADT.xsd	Sat Jul 21 21:59:38 2012
++++ ogc/ols/1.1.0/ADT.xsd	Tue Oct  6 07:05:31 2015
+@@ -6,7 +6,8 @@
+  To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+ -->
+ 	<include schemaLocation="olsAll.xsd"/>
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/>
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<include schemaLocation="geometry.xsd"/>
+ 	<!--  The ADTs defined in this document represent the minimum set of essential elements as determined from the analysis of the APIs provided by OpenLS sponsors and participants. There are many additional elements that may be added but these are considered to be optional. The APIs considered include: Oracle, Webraska, ESRI, Vodafone, opt[e]way, NavTech, IntelliWhere, and LocatioNet. -->
+ 	<!--=============================================================================
+diff -urN ../resources-original/ogc/ols/1.1.0/DirectoryService.xsd ogc/ols/1.1.0/DirectoryService.xsd
+--- ../resources-original/ogc/ols/1.1.0/DirectoryService.xsd	Sat Jul 21 21:59:38 2012
++++ ogc/ols/1.1.0/DirectoryService.xsd	Tue Oct  6 07:05:31 2015
+@@ -5,7 +5,8 @@
+  Copyright (c) 2006,2010 Open Geospatial Consortium.
+  To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+ -->
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/>
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<include schemaLocation="XLS.xsd"/>
+ 	<!-- ====================================================== -->
+ 	<element name="DirectoryRequest" type="xls:DirectoryRequestType" substitutionGroup="xls:_RequestParameters"/>
+diff -urN ../resources-original/ogc/ols/1.1.0/GatewayService.xsd ogc/ols/1.1.0/GatewayService.xsd
+--- ../resources-original/ogc/ols/1.1.0/GatewayService.xsd	Sat Jul 21 21:59:38 2012
++++ ogc/ols/1.1.0/GatewayService.xsd	Tue Oct  6 07:05:31 2015
+@@ -5,7 +5,8 @@
+  Copyright (c) 2006,2010 Open Geospatial Consortium.
+  To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+ -->
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/>
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<include schemaLocation="XLS.xsd"/>
+ 	<!--================= Gateway Request and Response Context=========================-->
+ 	<element name="_GatewayParameters" type="xls:AbstractGatewayParametersType" abstract="false">
+diff -urN ../resources-original/ogc/ols/1.1.0/LocationUtilityService.xsd ogc/ols/1.1.0/LocationUtilityService.xsd
+--- ../resources-original/ogc/ols/1.1.0/LocationUtilityService.xsd	Sat Jul 21 21:59:38 2012
++++ ogc/ols/1.1.0/LocationUtilityService.xsd	Tue Oct  6 07:05:31 2015
+@@ -6,7 +6,8 @@
+  To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+ -->
+ 	<include schemaLocation="olsAll.xsd"/>
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/>
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<include schemaLocation="XLS.xsd"/>
+ 	<!-- ====================================================== -->
+ 	<element name="GeocodeRequest" type="xls:GeocodeRequestType" substitutionGroup="xls:_RequestParameters">
+diff -urN ../resources-original/ogc/ols/1.1.0/PresentationService.xsd ogc/ols/1.1.0/PresentationService.xsd
+--- ../resources-original/ogc/ols/1.1.0/PresentationService.xsd	Sat Jul 21 21:59:38 2012
++++ ogc/ols/1.1.0/PresentationService.xsd	Tue Oct  6 07:05:31 2015
+@@ -6,7 +6,8 @@
+  To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+ -->
+ 	<include schemaLocation="olsAll.xsd"/>
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/>
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<include schemaLocation="XLS.xsd"/>
+ 	<!-- ==============================================GetCapabilities Request=====================-->
+ 	<element name="GetPortrayMapCapabilitiesRequest" type="xls:GetPortrayMapCapabilitiesRequestType" substitutionGroup="xls:_RequestParameters">
+diff -urN ../resources-original/ogc/ols/1.1.0/RouteService.xsd ogc/ols/1.1.0/RouteService.xsd
+--- ../resources-original/ogc/ols/1.1.0/RouteService.xsd	Sat Jul 21 21:59:38 2012
++++ ogc/ols/1.1.0/RouteService.xsd	Tue Oct  6 07:05:31 2015
+@@ -7,7 +7,8 @@
+  To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+ -->
+ 	<include schemaLocation="olsAll.xsd"/>
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/>
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<include schemaLocation="XLS.xsd"/>
+ 	<!-- ======================================================================================
+ 				Route Service Basic
+diff -urN ../resources-original/ogc/ols/1.1.0/geometry.xsd ogc/ols/1.1.0/geometry.xsd
+--- ../resources-original/ogc/ols/1.1.0/geometry.xsd	Sat Jul 21 21:59:38 2012
++++ ogc/ols/1.1.0/geometry.xsd	Tue Oct  6 07:05:31 2015
+@@ -6,7 +6,8 @@
+  To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+ -->
+ 	<include schemaLocation="olsAll.xsd"/>
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/>
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/>
+ 	<include schemaLocation="UOM.xsd"/>
+ 	<!-- =============================== type ===================================== -->
+diff -urN ../resources-original/ogc/ols/1.2/ADT.xsd ogc/ols/1.2/ADT.xsd
+--- ../resources-original/ogc/ols/1.2/ADT.xsd	Sat Jul 21 21:59:38 2012
++++ ogc/ols/1.2/ADT.xsd	Tue Oct  6 07:05:31 2015
+@@ -10,7 +10,8 @@
+ 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+ 	-->
+ 	<include schemaLocation="olsAll.xsd"/>
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/>
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<include schemaLocation="geometry.xsd"/>
+ 	<!--  The ADTs defined in this document represent the minimum set of essential elements as determined from the analysis of the APIs provided by OpenLS sponsors and participants. There are many additional elements that may be added but these are considered to be optional. The APIs considered include: Oracle, Webraska, ESRI, Vodafone, opt[e]way, NavTech, IntelliWhere, and LocatioNet. -->
+ 	<!--=============================================================================
+diff -urN ../resources-original/ogc/ols/1.2/DirectoryService.xsd ogc/ols/1.2/DirectoryService.xsd
+--- ../resources-original/ogc/ols/1.2/DirectoryService.xsd	Sat Jul 21 21:59:38 2012
++++ ogc/ols/1.2/DirectoryService.xsd	Tue Oct  6 07:05:31 2015
+@@ -9,7 +9,8 @@
+ 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+ 	-->
+ 	<include schemaLocation="olsAll.xsd"/>
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/>
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<include schemaLocation="XLS.xsd"/>
+ 	<!-- ====================================================== -->
+ 	<element name="DirectoryRequest" type="xls:DirectoryRequestType" substitutionGroup="xls:_RequestParameters"/>
+diff -urN ../resources-original/ogc/ols/1.2/GatewayService.xsd ogc/ols/1.2/GatewayService.xsd
+--- ../resources-original/ogc/ols/1.2/GatewayService.xsd	Sat Jul 21 21:59:38 2012
++++ ogc/ols/1.2/GatewayService.xsd	Tue Oct  6 07:05:31 2015
+@@ -9,7 +9,8 @@
+ 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+ 	-->
+ 	<include schemaLocation="olsAll.xsd"/>
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/>
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<include schemaLocation="XLS.xsd"/>
+ 	<!--================= Gateway Request and Response Context=========================-->
+ 	<element name="_GatewayParameters" type="xls:AbstractGatewayParametersType" abstract="false">
+diff -urN ../resources-original/ogc/ols/1.2/LocationUtilityService.xsd ogc/ols/1.2/LocationUtilityService.xsd
+--- ../resources-original/ogc/ols/1.2/LocationUtilityService.xsd	Sat Jul 21 21:59:38 2012
++++ ogc/ols/1.2/LocationUtilityService.xsd	Tue Oct  6 07:05:31 2015
+@@ -10,7 +10,8 @@
+ 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+ 	-->
+ 	<include schemaLocation="olsAll.xsd"/>
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/>
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<include schemaLocation="XLS.xsd"/>
+ 	<!-- ====================================================== -->
+ 	<element name="GeocodeRequest" type="xls:GeocodeRequestType" substitutionGroup="xls:_RequestParameters">
+diff -urN ../resources-original/ogc/ols/1.2/PresentationService.xsd ogc/ols/1.2/PresentationService.xsd
+--- ../resources-original/ogc/ols/1.2/PresentationService.xsd	Sat Jul 21 21:59:38 2012
++++ ogc/ols/1.2/PresentationService.xsd	Tue Oct  6 07:05:31 2015
+@@ -10,7 +10,8 @@
+ 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+ 	-->
+ 	<include schemaLocation="olsAll.xsd"/>
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/>
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<include schemaLocation="XLS.xsd"/>
+ 	<!-- ==============================================GetCapabilities Request=====================-->
+ 	<element name="GetPortrayMapCapabilitiesRequest" type="xls:GetPortrayMapCapabilitiesRequestType" substitutionGroup="xls:_RequestParameters">
+diff -urN ../resources-original/ogc/ols/1.2/RouteService.xsd ogc/ols/1.2/RouteService.xsd
+--- ../resources-original/ogc/ols/1.2/RouteService.xsd	Sat Jul 21 21:59:38 2012
++++ ogc/ols/1.2/RouteService.xsd	Tue Oct  6 07:05:31 2015
+@@ -10,7 +10,8 @@
+ 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+ 	-->
+ 	<include schemaLocation="olsAll.xsd"/>
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/>
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<include schemaLocation="XLS.xsd"/>
+ 	<!-- ======================================================================================
+ 				Route Service Basic
+diff -urN ../resources-original/ogc/ols/1.2/geometry.xsd ogc/ols/1.2/geometry.xsd
+--- ../resources-original/ogc/ols/1.2/geometry.xsd	Sat Jul 21 21:59:38 2012
++++ ogc/ols/1.2/geometry.xsd	Tue Oct  6 07:05:31 2015
+@@ -11,7 +11,8 @@
+ 		To obtain additional rights of use, visit http://www.opengeospatial.org/legal/ .
+ 	-->
+ 	<include schemaLocation="olsAll.xsd"/>
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/> 
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.w3.org/1999/xlink.xsd"/> 
+ 	<include schemaLocation="UOM.xsd"/> 
+ 	<!-- =============================== type ===================================== --> 
+diff -urN ../resources-original/ogc/ols/1.3/nav-Positioning.xsd ogc/ols/1.3/nav-Positioning.xsd
+--- ../resources-original/ogc/ols/1.3/nav-Positioning.xsd	Thu Jul 31 14:46:16 2014
++++ ogc/ols/1.3/nav-Positioning.xsd	Wed Oct  7 06:23:59 2015
+@@ -8,7 +8,8 @@
+ 		</xsd:documentation>
+ 	</xsd:annotation>
+ 	<xsd:include schemaLocation="nav-All.xsd"/>
+-	<xsd:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/ols/1.2/gml4xls.xsd"/>
++	<!--xsd:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/ols/1.2/gml4xls.xsd"/-->
++	<xsd:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<xsd:import namespace="http://www.opengis.net/xls" schemaLocation="http://schemas.opengis.net/ols/1.2/XLS.xsd"/>
+ 	<xsd:include schemaLocation="nav-CursorUtil.xsd"/>
+ 	<xsd:include schemaLocation="nav-UOM.xsd"/>
+diff -urN ../resources-original/ogc/ols/1.3/nav-RouteService.xsd ogc/ols/1.3/nav-RouteService.xsd
+--- ../resources-original/ogc/ols/1.3/nav-RouteService.xsd	Thu Jul 31 14:46:16 2014
++++ ogc/ols/1.3/nav-RouteService.xsd	Wed Oct  7 06:24:26 2015
+@@ -8,7 +8,8 @@
+ 		</documentation>
+ 	</annotation>
+ 	<include schemaLocation="nav-All.xsd"/>
+-	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/ols/1.2/gml4xls.xsd"/>
++	<!--import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/ols/1.2/gml4xls.xsd"/-->
++	<import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+ 	<import namespace="http://www.opengis.net/xls" schemaLocation="http://schemas.opengis.net/ols/1.2/XLS.xsd"/>
+ 	<import namespace="http://www.opengis.net/xls" schemaLocation="http://schemas.opengis.net/ols/1.2/RouteService.xsd"/>
+ 	<include schemaLocation="nav-Positioning.xsd"/>
 diff -urN ../resources-original/ogc/ows/1.1.0/owsContents.xsd ogc/ows/1.1.0/owsContents.xsd
 --- ../resources-original/ogc/ows/1.1.0/owsContents.xsd	Sat Jul 21 21:59:38 2012
-+++ ogc/ows/1.1.0/owsContents.xsd	Wed Sep 23 08:58:46 2015
++++ ogc/ows/1.1.0/owsContents.xsd	Tue Oct  6 07:05:31 2015
 @@ -84,4 +84,8 @@
  		</complexContent>
  	</complexType>

 			</extension>
diff -urN ../resources-original/ogc/wcs/1.0.0/wcsCapabilities.xsd ogc/wcs/1.0.0/wcsCapabilities.xsd
--- ../resources-original/ogc/wcs/1.0.0/wcsCapabilities.xsd	Sat Jul 21 21:59:38 2012
+++ ogc/wcs/1.0.0/wcsCapabilities.xsd	Wed Sep 23 08:58:46 2015
@@ -444,9 +444,9 @@
         </xs:annotation>
         <xs:complexContent>

 </xsd:schema>
diff -urN ../resources-original/ogc/filter/1.1.0/expr.xsd ogc/filter/1.1.0/expr.xsd
--- ../resources-original/ogc/filter/1.1.0/expr.xsd	Sat Jul 21 21:59:38 2012
+++ ogc/filter/1.1.0/expr.xsd	Tue Oct  6 07:05:31 2015
@@ -61,7 +61,11 @@
    </xsd:complexType>
    <xsd:complexType name="PropertyNameType">
