Merge branch 'fix-postgres-9.2' into flinc