Bumped the builder version to include a fix for entities in titles failing to build.
Bumped the version to include a fix for merging revisions.
Bumped the version to include a fix for merging revisions.
Merge branch 'master' into devel

Conflicts:
	pom.xml