Merge branch 'MDL-65796' of https://github.com/paulholden/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 22 May 2020 03:50:53 +0000 (11:50 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 22 May 2020 03:50:53 +0000 (11:50 +0800)

Trivial merge