ENH: Database upgrade fixes
ENH: Database upgrade fixes

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