Merge branch 'MDL-66796' of git://github.com/timhunt/moodle
authorJake Dallimore <jake@moodle.com>
Sun, 13 Oct 2019 23:41:19 +0000 (07:41 +0800)
committerJake Dallimore <jake@moodle.com>
Sun, 13 Oct 2019 23:41:19 +0000 (07:41 +0800)

Trivial merge