Merge branch 'MDL-67222-master' of git://github.com/bmbrands/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 26 Nov 2019 02:12:29 +0000 (10:12 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 26 Nov 2019 02:12:29 +0000 (10:12 +0800)

Trivial merge