Merge branch 'MDL-62420-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 14 May 2018 03:57:52 +0000 (11:57 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 14 May 2018 03:57:52 +0000 (11:57 +0800)

Trivial merge