Merge branch 'MDL-68729-master' of https://github.com/sammarshallou/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2020 23:28:51 +0000 (01:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2020 23:28:51 +0000 (01:28 +0200)

Trivial merge