mvz Merge pull request #913 from cucumber/fix-new-rubocop-offenses