Merge branch 'MDL-68784' of https://github.com/Peterburnett/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jul 2020 04:35:37 +0000 (12:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jul 2020 04:35:37 +0000 (12:35 +0800)

Trivial merge