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

Trivial merge