Merge branch 'MDL-63352-master' of git://github.com/peterRd/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Oct 2018 06:50:10 +0000 (14:50 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Oct 2018 06:50:10 +0000 (14:50 +0800)

Trivial merge