opscode/chef — pull request #2661 by btm (2014-12-16 18:42:16+00:00)
Title: test appveyor

rebase against master of #2655, #2653, #2644 to see if it'll pass appveyor.