Merge branch 'MDL-60707' of git://github.com/aolley/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 13 Nov 2017 05:26:00 +0000 (13:26 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 13 Nov 2017 05:26:00 +0000 (13:26 +0800)

Trivial merge