Merge branch 'MDL-67513-master-fix' of https://github.com/andrewnicols/moodle into...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Nov 2020 08:17:31 +0000 (09:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Nov 2020 08:17:31 +0000 (09:17 +0100)

Trivial merge