Merge opscode master