Merge branch 'MDL-55611-master-behat-fix' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 6 Apr 2017 07:56:51 +0000 (08:56 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 6 Apr 2017 07:56:51 +0000 (08:56 +0100)

Trivial merge