From: Jake Dallimore <jake@moodle.com>
Date: Tue, 8 Dec 2020 08:31:54 +0000 (+0800)
Subject: Merge branch 'MDL-70285' of https://github.com/timhunt/moodle
X-Git-Tag: v4.0.0-beta~1952
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=7430e7c0740f1c9be0d709625c33e47c220e1576

Merge branch 'MDL-70285' of https://github.com/timhunt/moodle
---

7430e7c0740f1c9be0d709625c33e47c220e1576