Merge branch 'MDL-59606' of git://github.com/timhunt/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 30 Oct 2017 03:23:18 +0000 (11:23 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 30 Oct 2017 03:23:18 +0000 (11:23 +0800)

Trivial merge