Updating Changelog
Merge from master