[michael] The refactoring saga continues
Merge branch 'master' of github.com:Wallaceh/Cucumber_Java