Correct and clean-up changelog for master