Merge pull request #1234 from apache/dev-postgresql

Merge the dev branch to master branch