Update Changelog for stable

Conflicts:

	src/Changelog
Merge remote-tracking branch 'upstream/master'