Update for merges.
Merge branch 'master' of github.com:opscode/chef