Fixed a bug that was causing revisions to merge incorrectly.
Fixed another bug that was causing revisions to merge incorrectly.
Fixed a bug where adjusting a version number was adding leading zeros.
Fixed BZ#1050765 - Unable to use injections in Revision Histories.
Merge branch 'master' into devel

Conflicts:
	pom.xml