Merge branch 'MDL-67002' of https://github.com/timhunt/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Aug 2020 22:08:17 +0000 (00:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Aug 2020 22:08:17 +0000 (00:08 +0200)

Trivial merge