FIX Recent patch to DataObject#db changed API which broke core
Merge pull request #2197 from hafriedlander/fix/dbapichange

FIX Recent patch to DataObject#db changed API which broke core
Merge remote-tracking branch 'origin/3.1'