Version bump
Merge branch 'master' into cm-json-import-api

Conflicts:
	changelog.txt