opscode/chef — pull request #2094 by tyler-ball (2014-09-19 22:36:16+00:00)
Title: Restoring https://github.com/opscode/chef/pull/1921 to master

Somehow, it got totally deleted from master. @jtimberman @adamedx @mcquin @lamont-granquist could you give this a quick review before it goes to master? I checked the diff - it is the same as the commit from that PR.