Merge branch 'MDL-70139-master' of git://github.com/sarjona/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 6 Nov 2020 18:27:10 +0000 (19:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 6 Nov 2020 18:27:10 +0000 (19:27 +0100)

Trivial merge