Adding changes made by myplanetdigital/chef-xhprof@d8e2761