persistent 1.3
Merge branch 'postgres' into mysql

Conflicts:
	PROJECTNAME.cabal