Synched up changelogs for master and surprise