[CHEF-2821] v10

http://tickets.opscode.com/browse/CHEF-2821