Merge branch 'MDL-64348-master' of git://github.com/ryanwyllie/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 7 Jan 2019 04:08:31 +0000 (12:08 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 7 Jan 2019 04:08:31 +0000 (12:08 +0800)

Trivial merge