Merge branch 'MDL-68661-rebase' of https://github.com/Chocolate-lightning/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 22 May 2020 03:12:46 +0000 (11:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 22 May 2020 03:12:46 +0000 (11:12 +0800)

Trivial merge