Merge branch 'MDL-66109-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 11 May 2020 16:03:19 +0000 (00:03 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 11 May 2020 16:03:19 +0000 (00:03 +0800)

Trivial merge