Merge branch 'master' into 5.1-beta

Conflicts:
	pom.xml
upgrade maven-release-plugin

(fixes problems with git v1.8.5, see MRELEASE-812)
[maven-release-plugin] prepare release v5.1beta2
[maven-release-plugin] prepare for next development iteration