Merge branch 'MDL-63875' of https://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 8 Nov 2018 01:41:16 +0000 (09:41 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 8 Nov 2018 01:41:16 +0000 (09:41 +0800)

Trivial merge