Merge branch 'master' into issue_438

Conflicts:
	CHANGES.rst
	setup.py
Fix changelog