Merge branch 'MDL-65042-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Sep 2019 01:29:00 +0000 (09:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Sep 2019 01:29:00 +0000 (09:29 +0800)

Trivial merge