Merge branch 'MDL-63666-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Nov 2018 02:46:33 +0000 (10:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Nov 2018 02:46:33 +0000 (10:46 +0800)

Trivial merge