Update pom.xml
Merge branch '2.0-maint' into 2.1-maint

Conflicts:
	pom.xml