Merge branch 'MDL-70148-master' of git://github.com/andrewnicols/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Nov 2020 22:12:56 +0000 (23:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Nov 2020 22:12:56 +0000 (23:12 +0100)

Trivial merge