Merge branch 'MDL-67451-master' of git://github.com/sarjona/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 10 Dec 2019 02:36:54 +0000 (10:36 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 10 Dec 2019 02:36:54 +0000 (10:36 +0800)

Trivial merge