Update changelog for 1.0 branch
Merge branch '1.0'

Conflicts:
	CHANGELOG.md