Merge branch 'MDL-63280_master-fix' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 26 Oct 2018 01:07:30 +0000 (09:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 26 Oct 2018 01:07:30 +0000 (09:07 +0800)

Trivial merge