Merge branch 'MDL-61450-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 3 Oct 2019 07:42:19 +0000 (15:42 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 3 Oct 2019 07:42:19 +0000 (15:42 +0800)

Trivial merge