Merge pull request #1204 from Zrealshadow/dev-postgresql-patch-2