Update changelog
Merge changelog master/chiba