Issue #466
Merge branch 'issue-466' of git://github.com/Luxor/cucumber-jvm
Attribution. Closes #485, #466