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

Trivial merge