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

Trivial merge