Merge branch 'MDL-67336-master' of https://github.com/roland04/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 6 Jan 2020 01:36:36 +0000 (09:36 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 6 Jan 2020 01:36:36 +0000 (09:36 +0800)

Trivial merge