Merge branch 'MDL-66503-master' of git://github.com/abgreeve/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 16 Dec 2019 01:11:18 +0000 (09:11 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 16 Dec 2019 01:11:18 +0000 (09:11 +0800)

Trivial merge