Released 1.0.2
Merge branch 'master' into 1.1-wip

Conflicts:
	CHANGELOG.md