Updated the pom to include a fix in the builder.
Merge branch 'master' into devel

Conflicts:
	pom.xml