Update changelog
Merge remote-tracking branch 'origin/3.5' into 3.6