Merge pull request #1149 from apache/dev-postgresql

merge development branch to master branch for V4.2