Merge master into 7-stable for 7.2.0 release.