Merged upstream changes from Opscode