Merge branch 'MDL-69387-master-2' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Sep 2020 02:59:23 +0000 (10:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 Sep 2020 02:59:23 +0000 (10:59 +0800)

Trivial merge