Merge branch 'postgres' into sqlite

Conflicts:
	PROJECTNAME.cabal
Merge remote-tracking branch 'upstream/sqlite' into sqlite