Merge branch 'MDL-63375-master' of https://github.com/syxton/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Aug 2020 22:13:02 +0000 (00:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Aug 2020 22:13:02 +0000 (00:13 +0200)

Trivial merge