Update changelog to master