Merge branch 'wip-MDL-45500-master' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 04:56:18 +0000 (12:56 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 04:56:18 +0000 (12:56 +0800)

Trivial merge