CucumberUtils refactored to prevent copy/paste
Merge remote-tracking branch 'origin/master'