Bump the version.
Merge branch 'develop'

Conflicts:
	CHANGES.txt