Update CHANGELOG
Bump version
Merge branch 'master' into beta

Conflicts:
	CHANGELOG