Merge branch 'MDL-69087-310' of git://github.com/sarjona/moodle into MOODLE_310_STABLE
authorVíctor Déniz <victor@moodle.com>
Thu, 1 Oct 2020 22:42:20 +0000 (23:42 +0100)
committerVíctor Déniz <victor@moodle.com>
Thu, 1 Oct 2020 22:42:20 +0000 (23:42 +0100)

Trivial merge