Merge branch 'MDL-66034-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Aug 2019 01:30:14 +0000 (09:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Aug 2019 01:30:14 +0000 (09:30 +0800)

Trivial merge