Merge branch 'MDL-69975' of https://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 2 Nov 2020 16:00:44 +0000 (00:00 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 2 Nov 2020 16:00:44 +0000 (00:00 +0800)

Trivial merge