Merge upstream changes from opscode

Merge upstream changes from opscode