Fix database bugs, change notifier to only notify once.
Minor: Others/other play.
Merge remote-tracking branch 'upstream/master'