updated CHANGELOG.md
Merge commit '9d3202b8718b43323438ec72c11186eed23f0cb0'

Conflicts:
	CHANGELOG.md