Merge branch 'MDL-63717-master' of git://github.com/jleyva/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 5 Nov 2018 05:45:25 +0000 (13:45 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 5 Nov 2018 05:45:25 +0000 (13:45 +0800)

Trivial merge