Merge branch 'MDL-60976-master' of https://github.com/matt-catalyst/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 01:56:20 +0000 (09:56 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 01:56:20 +0000 (09:56 +0800)

Trivial merge