Merge branch 'MDL-67262-master-2' of git://github.com/snake/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 24 Feb 2020 07:56:04 +0000 (15:56 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 24 Feb 2020 07:56:04 +0000 (15:56 +0800)

Trivial merge