Merge branch 'MDL-61828-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 22:14:32 +0000 (00:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 22:14:32 +0000 (00:14 +0200)

Trivial merge