Merge branch 'MDL-59383-master-behat-failure' of https://github.com/lameze/moodle