Rebased up to Opscode Master