Merge pull request #1166 from apache/dev-postgresql

Merge Dev branch