Merge branch 'MDL-62134-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 16 May 2018 04:39:27 +0000 (12:39 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 16 May 2018 04:39:27 +0000 (12:39 +0800)

Trivial merge