Bumping version
Merge branch 'master' into configuration_variables

Conflicts:
	CHANGES.rst