Merge branch 'MDL-63451' of https://github.com/peterspicer-catalyst/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 7 Nov 2018 04:05:27 +0000 (12:05 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 7 Nov 2018 04:05:27 +0000 (12:05 +0800)

Trivial merge