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

Trivial merge