Merge remote branch 'origin/master'

Conflicts:
	pom.xml

Author: sdedwards

pom.xml

@@ -233,6 +233,15 @@ under the License.
 						<licenseFile>${project.basedir}/LICENSE</licenseFile>
 					</configuration>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-release-plugin</artifactId>
+					<version>2.5.2</version>
+					<configuration>
+						<autoVersionSubmodules>true</autoVersionSubmodules>
+						<tagNameFormat>v@{project.version}</tagNameFormat>
+					</configuration>
+				</plugin>
 				<plugin>
 					<groupId>de.jutzig</groupId>
 					<artifactId>github-release-plugin</artifactId>