Merge branch 'MDL-43156' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 1 May 2020 02:16:37 +0000 (10:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 1 May 2020 02:16:37 +0000 (10:16 +0800)

Trivial merge