Bump version
Clean-up merge files on clean_harmless
Merge branch 'master' into develop

Conflicts:
	CHANGES
	VERSION
	docs/conf.py
More details about development instance