Merge branch 'MDL-68697-master' of git://github.com/andrewnicols/moodle
authorVíctor Déniz Falcón <victor@moodle.com>
Wed, 13 May 2020 15:53:16 +0000 (16:53 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Wed, 13 May 2020 15:53:16 +0000 (16:53 +0100)

Trivial merge