Releasing 1.6.10
Merge branch '1.6' into 1.7

Conflicts:
	ChangeLog
Releasing 1.7.8