Sync CHANGELOG with 1-7-stable