Update changelog
Update changelog
Merge remote-tracking branch 'monolog/master' into develop

Conflicts:
	CHANGELOG.mdown