From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 4 May 2020 07:59:04 +0000 (+0800)
Subject: Merge branch 'MDL-68502-master' of git://github.com/ferranrecio/moodle
X-Git-Tag: v3.9.0-beta~272
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=3ba4248fe75f049cf8e4287088c005c01c5990d8

Merge branch 'MDL-68502-master' of git://github.com/ferranrecio/moodle
---

3ba4248fe75f049cf8e4287088c005c01c5990d8