Merge pull request #1655 from dangowrt/update-postgresql