Merge branch 'MDL-60835-master' of git://github.com/crazyserver/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 20 Nov 2017 03:27:46 +0000 (11:27 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 20 Nov 2017 03:27:46 +0000 (11:27 +0800)

Trivial merge