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

Trivial merge