Merge branch 'MDL-63711-master-fix' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Nov 2018 06:20:24 +0000 (14:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 6 Nov 2018 14:48:30 +0000 (15:48 +0100)

Trivial merge