Avoid needless resetting of defaults
Merge commit 'd5e3026'

Conflicts:
	persistent-postgresql/Database/Persist/Postgresql.hs
	persistent-postgresql/persistent-postgresql.cabal