Merge branch 'MDL-60774-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Apr 2018 22:02:49 +0000 (00:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Apr 2018 22:02:49 +0000 (00:02 +0200)

Trivial merge