Merge branch 'MDL-65584' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 12 Oct 2019 23:49:19 +0000 (01:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 12 Oct 2019 23:49:19 +0000 (01:49 +0200)

Trivial merge