Merge branch 'MDL-59383-master-behat-failure' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 14 Jul 2017 03:52:53 +0000 (11:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 14 Jul 2017 03:52:53 +0000 (11:52 +0800)

Trivial merge