Merge branch 'MDL-67585-master-4' of git://github.com/snake/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 20 Feb 2020 03:58:02 +0000 (11:58 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 20 Feb 2020 03:58:02 +0000 (11:58 +0800)

Trivial merge