Merge branch 'MDL-60783' of git://github.com/stronk7/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 13 Nov 2017 03:26:30 +0000 (11:26 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 13 Nov 2017 03:26:30 +0000 (11:26 +0800)

Trivial merge