Updated changelog and version info
Merge branch 'clipper-1.2.x' into develop

Conflicts:
	install/changelog.txt