persistent 1.3
Merge branch 'postgres' into postgres-fay