Merge branch 'MDL-64286' of https://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 3 Dec 2018 07:46:40 +0000 (15:46 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 3 Dec 2018 07:46:40 +0000 (15:46 +0800)

Trivial merge