Initial changelog update for 3.6.2.
Merge remote-tracking branch 'upstream/3.6.x' into 3.6.x