Update master to latest 1.7.2 fixes.

This makes 1.7.2 branch obsolete!