ENH: merge in fixes from release tree
ENH: merge in fixes from release tree

jcfr/CDash,cpatrick/CDash,cpatrick/CDash,jcfr/CDash,jcfr/CDash,jcfr/CDash,jcfr/CDash,jcfr/CDash,cpatrick/CDash,cpatrick/CDash,cpatrick/CDash,cpatrick/CDash