Bump version
Merge branch 'master' into 3.2.0

Conflicts:
	pom.xml