Merge branch 'MDL-69492' of https://github.com/paulholden/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 8 Sep 2020 04:56:54 +0000 (12:56 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 8 Sep 2020 04:56:54 +0000 (12:56 +0800)

Trivial merge