Merge branch 'MDL-61348-take2' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Apr 2018 23:59:15 +0000 (01:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Apr 2018 23:59:15 +0000 (01:59 +0200)

Trivial merge