merge in stuff from 0.71 release branch