Re-inserting stuff that got lost when moving changelog around