Merge upstream changes from opscode/chef-repo