Merge branch 'hotfix-0.24.x' into hotfix-0.25.x

Conflicts:
	pom.xml
	src/css/aloha.css