Merge branch 'MDL-63671-master-2' of git://github.com/mihailges/moodle
authorDamyon Wiese <damyon@moodle.com>
Fri, 9 Nov 2018 01:12:49 +0000 (09:12 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 9 Nov 2018 01:12:49 +0000 (09:12 +0800)

Trivial merge