Fixed a bug that was causing entities in titles to be invalid.
Merge branch 'master' into devel

Conflicts:
	pom.xml