Merge branch 'MDL-54021-master' of git://github.com/mihailges/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 00:55:57 +0000 (08:55 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 00:55:57 +0000 (08:55 +0800)

Trivial merge