Merge branch 'MDL-69192-master-behat' of https://github.com/andrewnicols/moodle