manually merge https://github.com/opscode-cookbooks/postgresql/pull/68/files #68