Merge remote-tracking branch 'origin/devel'

Conflicts:
	pom.xml