From: Jake Dallimore <jake@moodle.com>
Date: Wed, 1 Jul 2020 09:06:01 +0000 (+0800)
Subject: Merge branch 'MDL-63167-master' of git://github.com/peterRd/moodle
X-Git-Tag: v3.10.0-beta~467
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=2cde5c5267432198ad552f2f310c0641499ae5ed

Merge branch 'MDL-63167-master' of git://github.com/peterRd/moodle
---

2cde5c5267432198ad552f2f310c0641499ae5ed