hotfix: better enforcment of single source, destination
Merge branch 'master' into develop

Conflicts:
	CHANGELOG.md
	version.json