Update changelog
Merge remote-tracking branch 'upstream/3.0' into 3.0