Merge branch 'MDL-55971' of https://github.com/paulholden/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Sep 2020 22:50:39 +0000 (00:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Sep 2020 22:50:39 +0000 (00:50 +0200)

Trivial merge