Merge branch 'MDL-66818-39' of git://github.com/andrewnicols/moodle into MOODLE_39_STABLE
authorJun Pataleta <jun@moodle.com>
Fri, 21 Aug 2020 03:32:35 +0000 (11:32 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 21 Aug 2020 03:32:35 +0000 (11:32 +0800)

Trivial merge