Merge branch 'MDL-66263' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Sun, 3 May 2020 12:21:17 +0000 (20:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Sun, 3 May 2020 12:21:17 +0000 (20:21 +0800)

Trivial merge