Behat 3 tweaks
Merge pull request #1 from tomphp/behat3

Behat 3 tweaks