Merge branch 'MDL-67731' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2020 22:59:26 +0000 (23:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Mar 2020 22:59:26 +0000 (23:59 +0100)

Trivial merge