Merge branch 'MDL-63535-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Oct 2018 03:11:22 +0000 (11:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Oct 2018 03:11:22 +0000 (11:11 +0800)

Trivial merge