Merge branch 'MDL-69644-310' of https://github.com/paulholden/moodle into MOODLE_310_...
authorVíctor Déniz <victor@moodle.com>
Mon, 28 Sep 2020 19:34:01 +0000 (20:34 +0100)
committerVíctor Déniz <victor@moodle.com>
Mon, 28 Sep 2020 19:34:01 +0000 (20:34 +0100)

Trivial merge