Merge branch 'MDL-68390-master' of git://github.com/andrewnicols/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jul 2020 17:34:45 +0000 (19:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jul 2020 17:34:45 +0000 (19:34 +0200)

Trivial merge