Merge branch 'MDL-60985-master' of git://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 24 Dec 2019 06:44:04 +0000 (14:44 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 24 Dec 2019 06:44:04 +0000 (14:44 +0800)

Trivial merge