Merge branch 'MDL-68706-39' of https://github.com/paulholden/moodle into MOODLE_39_STABLE
authorVictor Deniz Falcon <victor@moodle.com>
Wed, 29 Jul 2020 18:05:02 +0000 (19:05 +0100)
committerVictor Deniz Falcon <victor@moodle.com>
Wed, 29 Jul 2020 18:05:02 +0000 (19:05 +0100)

Trivial merge