Merge branch 'MDL-69336-39' of git://github.com/mickhawkins/moodle into MOODLE_39_STABLE
authorJun Pataleta <jun@moodle.com>
Tue, 4 Aug 2020 08:54:21 +0000 (16:54 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 4 Aug 2020 08:54:21 +0000 (16:54 +0800)

Trivial merge