Update for behat 3.0
Merge branch 'behat3'