Merge branch 'MDL-60043' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 03:49:40 +0000 (11:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 03:49:40 +0000 (11:49 +0800)

Trivial merge