Merge branch 'chef-provisioning'