Merge branch 'MDL-60882-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 23:36:11 +0000 (01:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 23:36:11 +0000 (01:36 +0200)

Trivial merge