Merge Opscode master