Merge pull request #8832 from annando/fix-db-error