Merge branch 'MDL-69228-39' of git://github.com/andrewnicols/moodle into MOODLE_39_STABLE
authorSara Arjona <sara@moodle.com>
Tue, 14 Jul 2020 10:41:23 +0000 (12:41 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 14 Jul 2020 10:41:23 +0000 (12:41 +0200)

Trivial merge