Merge branch 'MDL-60587-master-4' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 3 Nov 2017 00:37:31 +0000 (08:37 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 3 Nov 2017 00:37:31 +0000 (08:37 +0800)

Trivial merge