Merge branch 'MDL-68706' of https://github.com/paulholden/moodle
authorVictor Deniz Falcon <victor@moodle.com>
Wed, 29 Jul 2020 18:03:10 +0000 (19:03 +0100)
committerVictor Deniz Falcon <victor@moodle.com>
Wed, 29 Jul 2020 18:03:10 +0000 (19:03 +0100)

Trivial merge