Merge branch 'MDL-59845-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 4 May 2018 01:43:14 +0000 (09:43 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 4 May 2018 01:43:14 +0000 (09:43 +0800)

Trivial merge