Merge branch 'experimental' into v1.1

Conflicts:
	CHANGELOG.md