Be sure to drop the schema AND the DB
Merge branch 'master' into PIM-1620