fuck the CHANGES file
Merge branch 'develop'

Conflicts:
	CHANGES