Merge branch 'hotfix/0.7.2' into develop

Conflicts:
	CHANGELOG.md
	README.md