Upgrading Chef
Merge branch 'master' into release-2.0.0