Changes for 3.7.2 build.
Merge remote-tracking branch 'upstream/master'