Manually merge https://github.com/opscode/chef/pull/1359.
Manually merge https://github.com/opscode/chef/pull/1359.

sanditiffin/chef,cgvarela/chef,martinb3/chef,mio-g/chef,mikefaille/chef,cmluciano/chef,cmluciano/chef,malisettirammurthy/chef,jkerry/chef,robmul/chef,MichaelPereira/chef,3dinfluence/chef,nathwill/chef,someara/chef,criteo-forks/chef,renanvicente/chef,evan2645/chef,juliandunn/chef,nsdavidson/chef,mwrock/chef,jblaine/chef,faspl/chef,gsaslis/chef,mal/chef,higanworks/chef,aaron-lane/chef,onlyhavecans/chef,bahamas10/chef,nathwill/chef,nguyen-tien-mulodo/chef,askl56/chef,jblaine/chef,OpSitters/chef,permyakovsv/chef,MsysTechnologiesllc/chef,ekometti/chef,baberthal/chef,josb/chef,askl56/chef,Kast0rTr0y/chef,jagdeesh109/chef,Tensibai/chef,polamjag/chef,lamont-granquist/chef,aaron-lane/chef,josb/chef,jaymzh/chef,gsaslis/chef,robmul/chef,mikefaille/chef,BackSlasher/chef,Ppjet6/chef,criteo-forks/chef,acaiafa/chef,smurawski/chef,3dinfluence/chef,kaznishi/chef,robmul/chef,karthikrev/chef,legal90/chef,sempervictus/chef,pburkholder/chef,Igorshp/chef,mikefaille/chef,ckaushik/chef,pburkholder/chef,smurawski/chef,ktpan/chef-play,nalingarg2/chef-1,juliandunn/chef,EasonYi/chef,mwrock/chef,nguyen-tien-mulodo/chef,tomdoherty/chef,strangelittlemonkey/chef,jonlives/chef,sideci-sample/sideci-sample-chef,mattray/chef,Tensibai/chef,ccsplit/chef,baberthal/chef,swalberg/chef,docwhat/chef,strangelittlemonkey/chef,ktpan/chef-play,cachamber/chef,zuazo-forks/chef,antonifs/chef,sometimesfood/chef,mikedodge04/chef,ranjib/chef,faspl/chef,onlyhavecans/chef,Igorshp/chef,ekometti/chef,cgvarela/chef,zuazo-forks/chef,sideci-sample/sideci-sample-chef,custora/chef,oclaussen/chef,jmhardison/chef,robmul/chef,skmichaelson/chef,gsaslis/chef,malisettirammurthy/chef,nsdavidson/chef,lamont-granquist/chef,ckaushik/chef,nvwls/chef,youngjl1/chef,polamjag/chef,karthikrev/chef,oclaussen/chef,danielsdeleo/seth,danielsdeleo/seth,jmhardison/chef,cachamber/chef,malisettirammurthy/chef,ckaushik/chef,lamont-granquist/chef,nalingarg2/chef-1,mikefaille/chef,clintoncwolfe/chef,oclaussen/chef,MsysTechnologiesllc/chef,askl56/chef,cmluciano/chef,clintoncwolfe/chef,zshuo/chef,ekometti/chef,sometimesfood/chef,Ppjet6/chef,sometimesfood/chef,bahamas10/chef,Tensibai/chef,jkerry/chef,nvwls/chef,gsaslis/chef,jordane/chef,nguyen-tien-mulodo/chef,lamont-granquist/chef,docwhat/chef,josb/chef,h4ck3rm1k3/chef,onlyhavecans/chef,tbunnyman/chef,sanditiffin/chef,brettcave/chef,antonifs/chef,nsdavidson/chef,b002368/chef-repo,DeWaRs1206/chef,AndyBoucher/Chef-Testing,faspl/chef,mal/chef,sideci-sample/sideci-sample-chef,juliandunn/chef,patcon/chef,jk47/chef,chef/chef,ktpan/chef-play,EasonYi/chef,legal90/chef,lamont-granquist/chef,mal/chef,3dinfluence/chef,legal90/chef,AndyBoucher/Chef-Testing,acaiafa/chef,sekrett/chef,jonlives/chef,cachamber/chef,faspl/chef,antonifs/chef,mio-g/chef,jonlives/chef,jagdeesh109/chef,Kast0rTr0y/chef,patcon/chef,criteo-forks/chef,sempervictus/chef,natewalck/chef,chef/chef,nguyen-tien-mulodo/chef,cachamber/chef,gsaslis/chef,zshuo/chef,jaymzh/chef,tbunnyman/chef,smurawski/chef,skmichaelson/chef,cmluciano/chef,zshuo/chef,someara/chef,brettcave/chef,AndyBoucher/Chef-Testing,aaron-lane/chef,b002368/chef-repo,martinisoft/chef,zuazo-forks/chef,jaymzh/chef,mattray/chef,ccsplit/chef,nellshamrell/chef,BackSlasher/chef,ktpan/chef-play,custora/chef,polamjag/chef,jmhardison/chef,nellshamrell/chef,Igorshp/chef,criteo-forks/chef,adamleff/chef,juliandunn/chef,b002368/chef-repo,jmhardison/chef,tas50/chef-1,circleback/chef,cgvarela/chef,strangelittlemonkey/chef,custora/chef,nicklv/chef,karthikrev/chef,b002368/chef-repo,Ppjet6/chef,nvwls/chef,docwhat/chef,Ppjet6/chef,cmluciano/chef,mikedodge04/chef,ranjib/chef,nalingarg2/chef-1,ducthanh/chef,jk47/chef,EasonYi/chef,h4ck3rm1k3/chef,nsdavidson/chef,joemiller/chef,natewalck/chef,baberthal/chef,MichaelPereira/chef,onlyhavecans/chef,h4ck3rm1k3/chef,zshuo/chef,paulmooring/chef,gsaslis/chef,oclaussen/chef,ranjib/chef,patcon/chef,mio-g/chef,nsdavidson/chef,h4ck3rm1k3/chef,patcon/chef,ChaosCloud/chef,DeWaRs1206/chef,sempervictus/chef,jagdeesh109/chef,paulmooring/chef,bahamas10/chef,permyakovsv/chef,sometimesfood/chef,cachamber/chef,andrewpsp/chef,jblaine/chef,sideci-sample/sideci-sample-chef,sideci-sample/sideci-sample-chef,renanvicente/chef,nellshamrell/chef,sempervictus/chef,OpSitters/chef,kaznishi/chef,grubernaut/chef,ChaosCloud/chef,nicklv/chef,BackSlasher/chef,martinb3/chef,martinisoft/chef,circleback/chef,swalberg/chef,joemiller/chef,OpSitters/chef,b002368/chef-repo,mio-g/chef,jimmymccrory/chef,circleback/chef,circleback/chef,ranjib/chef,legal90/chef,polamjag/chef,paulmooring/chef,erkolson/chef,evan2645/chef,BackSlasher/chef,karthikrev/chef,martinb3/chef,ChaosCloud/chef,mikedodge04/chef,ekometti/chef,ChaosCloud/chef,clintoncwolfe/chef,sanditiffin/chef,bahamas10/chef,polamjag/chef,swalberg/chef,natewalck/chef,grubernaut/chef,kaznishi/chef,tas50/chef-1,mattray/chef,brettcave/chef,jimmymccrory/chef,polamjag/chef,custora/chef,someara/chef,permyakovsv/chef,mal/chef,ekometti/chef,nguyen-tien-mulodo/chef,martinisoft/chef,cgvarela/chef,zuazo-forks/chef,Tensibai/chef,nicklv/chef,ducthanh/chef,BackSlasher/chef,nicklv/chef,sekrett/chef,askl56/chef,jaymzh/chef,webframp/chef,nathwill/chef,adamleff/chef,sekrett/chef,erkolson/chef,cachamber/chef,mwrock/chef,natewalck/chef,evan2645/chef,circleback/chef,aaron-lane/chef,skmichaelson/chef,BackSlasher/chef,jordane/chef,nalingarg2/chef-1,mal/chef,robmul/chef,sempervictus/chef,acaiafa/chef,youngjl1/chef,tas50/chef-1,cgvarela/chef,adamleff/chef,nvwls/chef,permyakovsv/chef,jmhardison/chef,Kast0rTr0y/chef,acaiafa/chef,jblaine/chef,chef/chef,swalberg/chef,robmul/chef,webframp/chef,skmichaelson/chef,tomdoherty/chef,pburkholder/chef,malisettirammurthy/chef,sanditiffin/chef,EasonYi/chef,EasonYi/chef,nvwls/chef,Igorshp/chef,someara/chef,tbriggs-curse/chef,lamont-granquist/chef,tbunnyman/chef,tbriggs-curse/chef,adamleff/chef,martinb3/chef,legal90/chef,erkolson/chef,kaznishi/chef,mio-g/chef,webframp/chef,jk47/chef,strangelittlemonkey/chef,smurawski/chef,jimmymccrory/chef,natewalck/chef,evan2645/chef,docwhat/chef,OpSitters/chef,jordane/chef,docwhat/chef,sekrett/chef,nicklv/chef,mikefaille/chef,martinb3/chef,clintoncwolfe/chef,nellshamrell/chef,ktpan/chef-play,tomdoherty/chef,sekrett/chef,martinisoft/chef,zshuo/chef,erkolson/chef,tas50/chef-1,kaznishi/chef,evan2645/chef,faspl/chef,karthikrev/chef,ChaosCloud/chef,nalingarg2/chef-1,zshuo/chef,permyakovsv/chef,acaiafa/chef,Ppjet6/chef,ChaosCloud/chef,Igorshp/chef,webframp/chef,3dinfluence/chef,legal90/chef,webframp/chef,gene1wood/chef,Ppjet6/chef,chef/chef,custora/chef,jblaine/chef,Kast0rTr0y/chef,ckaushik/chef,OpSitters/chef,danielsdeleo/seth,smurawski/chef,bahamas10/chef,tbriggs-curse/chef,jimmymccrory/chef,brettcave/chef,webframp/chef,josb/chef,youngjl1/chef,higanworks/chef,youngjl1/chef,grubernaut/chef,Kast0rTr0y/chef,jonlives/chef,permyakovsv/chef,DeWaRs1206/chef,grubernaut/chef,zuazo-forks/chef,nicklv/chef,baberthal/chef,nathwill/chef,tomdoherty/chef,DeWaRs1206/chef,tbunnyman/chef,jkerry/chef,jkerry/chef,nalingarg2/chef-1,criteo-forks/chef,martinisoft/chef,danielsdeleo/seth,malisettirammurthy/chef,patcon/chef,ekometti/chef,nathwill/chef,nellshamrell/chef,ccsplit/chef,Kast0rTr0y/chef,baberthal/chef,joemiller/chef,MsysTechnologiesllc/chef,mwrock/chef,jk47/chef,mikedodge04/chef,sanditiffin/chef,AndyBoucher/Chef-Testing,cgvarela/chef,mio-g/chef,paulmooring/chef,AndyBoucher/Chef-Testing,brettcave/chef,josb/chef,tbunnyman/chef,ducthanh/chef,sekrett/chef,sempervictus/chef,mikefaille/chef,ckaushik/chef,nsdavidson/chef,mal/chef,mikedodge04/chef,andrewpsp/chef,jagdeesh109/chef,ducthanh/chef,strangelittlemonkey/chef,ccsplit/chef,skmichaelson/chef,renanvicente/chef,jk47/chef,antonifs/chef,youngjl1/chef,joemiller/chef,onlyhavecans/chef,clintoncwolfe/chef,renanvicente/chef,andrewpsp/chef,AndyBoucher/Chef-Testing,MichaelPereira/chef,nguyen-tien-mulodo/chef,natewalck/chef,aaron-lane/chef,erkolson/chef,andrewpsp/chef,skmichaelson/chef,andrewpsp/chef,erkolson/chef,jonlives/chef,mattray/chef,jonlives/chef,josb/chef,MichaelPereira/chef,tbunnyman/chef,gene1wood/chef,DeWaRs1206/chef,baberthal/chef,Tensibai/chef,tbriggs-curse/chef,youngjl1/chef,nathwill/chef,patcon/chef,tbriggs-curse/chef,antonifs/chef,malisettirammurthy/chef,h4ck3rm1k3/chef,martinb3/chef,nellshamrell/chef,docwhat/chef,nvwls/chef,renanvicente/chef,gene1wood/chef,swalberg/chef,danielsdeleo/seth,pburkholder/chef,oclaussen/chef,sometimesfood/chef,karthikrev/chef,ckaushik/chef,ducthanh/chef,someara/chef,jagdeesh109/chef,jimmymccrory/chef,smurawski/chef,askl56/chef,b002368/chef-repo,tomdoherty/chef,jimmymccrory/chef,swalberg/chef,MsysTechnologiesllc/chef,andrewpsp/chef,someara/chef,sometimesfood/chef,ranjib/chef,OpSitters/chef,grubernaut/chef,mattray/chef,tbriggs-curse/chef,evan2645/chef,h4ck3rm1k3/chef,DeWaRs1206/chef,aaron-lane/chef,higanworks/chef,brettcave/chef,sanditiffin/chef,jordane/chef,ranjib/chef,criteo-forks/chef,higanworks/chef,joemiller/chef,askl56/chef,jkerry/chef,3dinfluence/chef,antonifs/chef,jordane/chef,zuazo-forks/chef,MichaelPereira/chef,jblaine/chef,paulmooring/chef,pburkholder/chef,faspl/chef,3dinfluence/chef,EasonYi/chef,joemiller/chef,jmhardison/chef,higanworks/chef,adamleff/chef,custora/chef,circleback/chef,ccsplit/chef,jk47/chef,MichaelPereira/chef,renanvicente/chef,ducthanh/chef,adamleff/chef,jagdeesh109/chef,pburkholder/chef,acaiafa/chef,clintoncwolfe/chef,jkerry/chef,strangelittlemonkey/chef,onlyhavecans/chef,gene1wood/chef,oclaussen/chef,kaznishi/chef,grubernaut/chef,Igorshp/chef,ktpan/chef-play,bahamas10/chef,juliandunn/chef,ccsplit/chef,paulmooring/chef,mikedodge04/chef