Merge branch 'MDL-56041-master-fix' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jul 2020 04:39:17 +0000 (12:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jul 2020 04:39:17 +0000 (12:39 +0800)

Trivial merge