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

Trivial merge