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

Trivial merge