Merge branch 'MDL-67074-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 6 Nov 2019 03:48:21 +0000 (11:48 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 6 Nov 2019 03:48:21 +0000 (11:48 +0800)

Trivial merge