Beginning of 1.7.2 port.

Just a straight port to start, taking advantage of 1.7.x capabilities
next.