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

Trivial merge