Merge branch 'MDL-64094' of https://github.com/NeillM/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 10 Sep 2019 06:42:58 +0000 (14:42 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 10 Sep 2019 06:42:58 +0000 (14:42 +0800)

Trivial merge