DOC: Updated changes
Merge branch 'master' into dev

Conflicts:
	CHANGES.rst