Merge branch 'MDL-67327-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 16 Dec 2019 07:11:23 +0000 (15:11 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 16 Dec 2019 07:11:23 +0000 (15:11 +0800)

Trivial merge