Merge branch 'MDL-60126-master-3' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Feb 2020 02:33:19 +0000 (10:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Feb 2020 02:33:19 +0000 (10:33 +0800)

Trivial merge