Merge pull request #1121 from apache/dev-postgresql

Merge dev-postgresql into Master