Merge branch 'MDL-61107' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 2 Jan 2018 07:34:39 +0000 (08:34 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 2 Jan 2018 07:34:39 +0000 (08:34 +0100)

Trivial merge