Merge branch 'MDL-66135' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Apr 2020 23:51:49 +0000 (01:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Apr 2020 23:51:49 +0000 (01:51 +0200)

Trivial merge