Merge branch 'postgres' into mysql

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