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

Trivial merge