Merge branch 'MDL-37745-master' of git://github.com/lucaboesch/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jul 2020 23:01:47 +0000 (01:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jul 2020 23:01:47 +0000 (01:01 +0200)

Trivial merge