Merge branch 'MDL-58058-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:59:50 +0000 (11:59 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:59:50 +0000 (11:59 +0800)

Trivial merge