Merge branch 'MDL-61836-master-fix' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:27:51 +0000 (02:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:27:51 +0000 (02:27 +0200)

Trivial merge