done migrating to ndb (actually)
Merge remote-tracking branch 'origin/master'