Merge branch 'MDL-60583' of https://github.com/NeillM/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Jul 2020 01:16:21 +0000 (09:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Jul 2020 01:16:21 +0000 (09:16 +0800)

Trivial merge