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

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

eec9da5b686d5024c8384d8cc956d2337fb671d1