Merge pull request #1123 from apache/dev-postgresql

Dev postgresql