Merge pull request #3097 from dangowrt/fix-postgresql-rebuild