Merge branch 'MDL-68968-master' of git://github.com/lameze/moodle
authorVictor Deniz Falcon <victor@moodle.com>
Wed, 29 Jul 2020 21:01:06 +0000 (22:01 +0100)
committerVictor Deniz Falcon <victor@moodle.com>
Wed, 29 Jul 2020 21:01:06 +0000 (22:01 +0100)

Trivial merge