Merge remote-tracking branch 'origin/master' into 3.2.0.