Fix version number in changelog.
Merge branch 'v1.7'

Conflicts:
	ChangeLog