Merge branch 'MDL-62651-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2018 16:38:05 +0000 (18:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2018 16:38:05 +0000 (18:38 +0200)

Trivial merge