Merge branch 'MDL-63223-master' of git://github.com/bmbrands/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 4 Dec 2018 04:06:13 +0000 (12:06 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 4 Dec 2018 04:06:13 +0000 (12:06 +0800)

Trivial merge