Merge branch 'MDL-67294-39' of git://github.com/mihailges/moodle into MOODLE_39_STABLE
authorJun Pataleta <jun@moodle.com>
Wed, 17 Jun 2020 02:36:14 +0000 (10:36 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 17 Jun 2020 02:36:14 +0000 (10:36 +0800)

Trivial merge