Modified changelog w/o releasing...
Merge branch '1.7' into 1.8

Conflicts:
	docs/changelog.rst
Merge branch '1.8'