Update changelog to match master