Index: /applications/editors/josm/plugins/geotools/.classpath
===================================================================
--- /applications/editors/josm/plugins/geotools/.classpath	(revision 33036)
+++ /applications/editors/josm/plugins/geotools/.classpath	(revision 33037)
@@ -4,57 +4,57 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2-noclassprop.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/gt-api-15.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-api-16.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-coverage-15.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-coverage-16.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-data-15.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-data-16.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-15.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-16.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-15.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-16.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-geotiff-15.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-geotiff-16.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-main-15.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-main-16.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-metadata-15.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-metadata-16.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-opengis-15.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-opengis-16.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-referencing-15.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-referencing-16.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/gt-shapefile-15.1.jar">
+	<classpathentry exported="true" kind="lib" path="lib/gt-shapefile-16.0.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://docs.geotools.org/stable/javadocs/"/>
@@ -62,8 +62,8 @@
 	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="lib/hsqldb-2.3.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-geocore-1.1.15.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-streams-1.1.15.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.1.15.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-utilities-1.1.15.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-geocore-1.1.16.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-streams-1.1.16.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.1.16.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/imageio-ext-utilities-1.1.16.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jai_codec-1.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jai_core-1.1.3.jar"/>
@@ -71,14 +71,14 @@
 	<classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jsr-275-1.0-beta-2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-colorconvert-1.0.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-colorconvert-1.0.11.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-contour-1.4.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-rangelookup-1.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-stats-1.0.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-utilities-1.0.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-stats-1.0.11.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-utilities-1.0.11.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-utils-1.4.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-vectorbinarize-1.4.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-vectorize-1.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-warp-1.0.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jt-zonal-1.0.9.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-warp-1.0.11.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jt-zonal-1.0.11.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jt-zonalstats-1.4.0.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-jts"/>
Index: /applications/editors/josm/plugins/geotools/README
===================================================================
--- /applications/editors/josm/plugins/geotools/README	(revision 33036)
+++ /applications/editors/josm/plugins/geotools/README	(revision 33037)
@@ -4,3 +4,3 @@
     * Licensed under GPL v3 (see LICENSE)
 
-The current embedded version of GeoTools is 15.1.
+The current embedded version of GeoTools is 16.0.
Index: /applications/editors/josm/plugins/geotools/build.xml
===================================================================
--- /applications/editors/josm/plugins/geotools/build.xml	(revision 33036)
+++ /applications/editors/josm/plugins/geotools/build.xml	(revision 33037)
@@ -67,8 +67,8 @@
         	     see http://stackoverflow.com/a/18495658/2257172 -->
             <attribute name="Specification-Title" value="JOSM GeoTools plugin"/>
-            <attribute name="Specification-Version" value="15.1"/>
+            <attribute name="Specification-Version" value="16.0"/>
             <attribute name="Specification-Vendor" value="JOSM developers" />
             <attribute name="Implementation-Title" value="org.openstreetmap.josm.plugins.geotools" />
-            <attribute name="Implementation-Version" value="15.1" />
+            <attribute name="Implementation-Version" value="16.0" />
             <attribute name="Implementation-Vendor" value="JOSM developers"/>
         </manifest>
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider	(revision 33036)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.geotools.referencing.operation.MathTransformProvider	(revision 33037)
@@ -56,2 +56,3 @@
 org.geotools.referencing.operation.projection.GeostationarySatellite$Provider
 org.geotools.referencing.operation.projection.RotatedPole$Provider
+org.geotools.referencing.operation.projection.AzimuthalEquidistant$Provider
Index: /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function
===================================================================
--- /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function	(revision 33036)
+++ /applications/editors/josm/plugins/geotools/jar/META-INF/services/org.opengis.filter.expression.Function	(revision 33037)
@@ -171,4 +171,5 @@
 org.geotools.filter.function.math.PiFunction
 org.geotools.filter.function.string.ConcatenateFunction
+org.geotools.filter.function.string.URLEncodeFunction
 org.geotools.filter.function.JenksNaturalBreaksFunction
 org.geotools.filter.function.FilterFunction_list