Merge branch 'MDL-63459' of https://github.com/timhunt/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 3 Dec 2018 06:21:31 +0000 (14:21 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 3 Dec 2018 06:21:31 +0000 (14:21 +0800)

Trivial merge