Merge branch 'MDL-62440' of git://github.com/timhunt/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 21 May 2018 06:55:16 +0000 (14:55 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 21 May 2018 06:55:16 +0000 (14:55 +0800)

Trivial merge