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

Trivial merge