Merge upstream changes from Opscode