Merge branch 'MDL-64375-master' of git://github.com/damyon/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 9 Jan 2019 07:33:09 +0000 (15:33 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 9 Jan 2019 07:33:09 +0000 (15:33 +0800)

Trivial merge