Merge branch 'MDL-65835-master' of git://github.com/abgreeve/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 2 Jan 2020 03:52:10 +0000 (11:52 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 2 Jan 2020 03:52:10 +0000 (11:52 +0800)

Trivial merge