Fixes
Merge branch 'release/release-2-11-2014_1_5_8' of github.com:alnutile/behat_editor into release/release-2-11-2014_1_5_8