Merge branch 'MDL-60968-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 02:19:00 +0000 (10:19 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 02:19:00 +0000 (10:19 +0800)

Trivial merge