Merge branch 'MDL-58827' of https://github.com/paulholden/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 16 Dec 2019 07:32:31 +0000 (15:32 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 16 Dec 2019 07:32:31 +0000 (15:32 +0800)

Trivial merge