Merge branch 'wip-MDL-62708-master' of https://github.com/Beedell/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Sep 2018 14:52:50 +0000 (16:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Sep 2018 14:52:50 +0000 (16:52 +0200)

Trivial merge