Merge branch 'MDL-65941-master' of https://github.com/snake/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2020 23:18:26 +0000 (00:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2020 23:18:26 +0000 (00:18 +0100)

Trivial merge