Merge branch 'MDL-63927' of git://github.com/stronk7/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 13 Nov 2018 03:57:12 +0000 (11:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 13 Nov 2018 03:57:12 +0000 (11:57 +0800)

Trivial merge