Freeze the maven release plugin version
Merge remote-tracking branch 'origin/master' into cvandyck/freeze-mvn-release
Merge branch 'master' into cvandyck/freeze-mvn-release

Conflicts:
	pom.xml