Merge branch 'MDL-60817-master-4' of git://github.com/mihailges/moodle
authorVíctor Déniz Falcón <victor@moodle.com>
Wed, 18 Mar 2020 14:26:30 +0000 (14:26 +0000)
committerVíctor Déniz Falcón <victor@moodle.com>
Wed, 18 Mar 2020 14:26:30 +0000 (14:26 +0000)

Trivial merge