Merge branch 'MDL-61665-master' of https://github.com/iamandrew/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:39:10 +0000 (00:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:39:10 +0000 (00:39 +0200)

Trivial merge