Merge branch 'MDL-66768-master' of git://github.com/rezaies/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 14 Oct 2019 03:21:03 +0000 (11:21 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 14 Oct 2019 03:21:03 +0000 (11:21 +0800)

Trivial merge