Closes #413.
Closes #413, #424, #444
Merge branch 'master' of github.com:cucumber/cucumber-jvm