Merge branch 'MDL-67392-master' of git://github.com/rezaies/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 9 Dec 2019 06:46:35 +0000 (14:46 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 9 Dec 2019 06:46:35 +0000 (14:46 +0800)

Trivial merge