Merge branch 'wip-MDL-27886-master' of https://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 23 Nov 2017 04:25:31 +0000 (12:25 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 23 Nov 2017 04:25:31 +0000 (12:25 +0800)

Trivial merge