Merge branch 'nomethod-gobbling'

Fixes https://tickets.opscode.com/browse/CHEF-5011