Merge pull request #1253 from apache/dev-postgresql

Merge Dev branch into master