Merge pull request #3220 from dangowrt/update-postgresql