Conflicts: code/controllers/CMSMain.php code/model/ErrorPage.php
See https://github.com/silverstripe-labs/silverstripe-behat-extension