update Changes file
Merge branch 'master' into devel

Conflicts:
	Changes