Merge branch 'MDL-67532' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Feb 2020 22:07:58 +0000 (23:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 14 Feb 2020 10:15:24 +0000 (11:15 +0100)

Trivial merge