(rubocop)
Merge branch 'master' of github.com:klamontagne/chef-burp