Merge branch 'MDL-68440-310' of https://github.com/Peterburnett/moodle into MOODLE_31...
authorVíctor Déniz <victor@moodle.com>
Tue, 13 Oct 2020 22:15:48 +0000 (23:15 +0100)
committerVíctor Déniz <victor@moodle.com>
Tue, 13 Oct 2020 22:15:48 +0000 (23:15 +0100)

Trivial merge