Merge branch 'MDL-62980' of https://github.com/paulholden/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2020 10:37:46 +0000 (12:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Aug 2020 10:37:46 +0000 (12:37 +0200)

Trivial merge