Issue 924

Creating a pull request for http://jira.codehaus.org/browse/JBEHAVE-924