Credit ddbeck :)
Merge branch '1.5' into 1.6

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