Merge branch 'MDL-68980-master' of git://github.com/andrewnicols/moodle
authorVictor Deniz Falcon <victor@moodle.com>
Wed, 10 Jun 2020 20:41:56 +0000 (21:41 +0100)
committerVictor Deniz Falcon <victor@moodle.com>
Wed, 10 Jun 2020 20:41:56 +0000 (21:41 +0100)

Trivial merge