fix #1409
Merge branch '2.0' of github.com:Codeception/Codeception into 2.0