Merge branch 'MDL-56511_master-fixbehat4' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 15:32:08 +0000 (17:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 15:32:08 +0000 (17:32 +0200)

Trivial merge