Merge branch 'MDL-69454-master' of git://github.com/bmbrands/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Sep 2020 15:10:35 +0000 (17:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Sep 2020 15:10:35 +0000 (17:10 +0200)

Trivial merge