Give a proper error when database url's aren't set
Merge remote-tracking branch 'origin/master' into deploy