Merge branch 'MDL-66945' of git://github.com/stronk7/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 29 Oct 2019 06:55:43 +0000 (14:55 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 29 Oct 2019 06:55:43 +0000 (14:55 +0800)

Trivial merge