Merge branch 'MDL-69625-310' of https://github.com/paulholden/moodle into MOODLE_310_...
authorVíctor Déniz <victor@moodle.com>
Mon, 5 Oct 2020 18:21:12 +0000 (19:21 +0100)
committerVíctor Déniz <victor@moodle.com>
Mon, 5 Oct 2020 18:21:12 +0000 (19:21 +0100)

Trivial merge