Merge branch 'MDL-68503_master' of https://github.com/marxjohnson/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 May 2020 12:29:52 +0000 (20:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 May 2020 12:29:52 +0000 (20:29 +0800)

Trivial merge