Merge branch '2.x'

Author: nebhale

pom.xml

@@ -183,7 +183,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.20.1</version>
+                    <version>2.20</version>
                     <configuration>
                         <runOrder>random</runOrder>
                     </configuration>