Fixed BZ#1043323 - Unable to build a book due to invalid XML being produced.
Merge branch 'master' into devel

Conflicts:
	pom.xml