Merge branch 'master' into v1.1.0

Conflicts:
	CHANGELOG.md
Merge branch 'v1.1.0' into default-procs

Conflicts:
	CHANGELOG.md