Merge branch 'MDL-59429-master' of git://github.com/mickhawkins/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 00:06:54 +0000 (02:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 00:06:54 +0000 (02:06 +0200)

Trivial merge