Merge branch 'MDL-66301-master' of git://github.com/mickhawkins/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Apr 2020 02:13:01 +0000 (10:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 6 Apr 2020 02:13:01 +0000 (10:13 +0800)

Trivial merge