Merge branch 'MDL-60741' of git://github.com/timhunt/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 14 Nov 2017 07:28:06 +0000 (15:28 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 14 Nov 2017 07:28:06 +0000 (15:28 +0800)

Trivial merge