From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 9 Dec 2020 04:09:37 +0000 (+0800)
Subject: Merge branch 'MDL-70295' of git://github.com/paulholden/moodle
X-Git-Tag: v4.0.0-beta~1946
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=9d8a0d35740f2d514464fecbf344534809823a87

Merge branch 'MDL-70295' of git://github.com/paulholden/moodle
---

9d8a0d35740f2d514464fecbf344534809823a87