Merge branch 'develop'
Merge branch 'develop'
update ChangeLog
Merge branch 'master' into develop

Conflicts:
	ChangeLog