Merge branch 'MDL-68658' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 25 May 2020 07:23:37 +0000 (15:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 25 May 2020 07:23:37 +0000 (15:23 +0800)

Trivial merge