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

Trivial merge