pull in disable database cleaner patch from 1.3.1