Chef 3521

Per CHEF-3521, please merge this into 10-stable.

http://tickets.opscode.com/browse/CHEF-3521