Merge branch 'int_behat' of https://github.com/skodak/moodle