From: Jake Dallimore <jake@moodle.com>
Date: Wed, 30 Sep 2020 03:45:06 +0000 (+0800)
Subject: Merge branch 'MDL-68845-master' of git://github.com/jleyva/moodle
X-Git-Tag: v4.0.0-beta~2209
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=9d5e79dbac425ce58e6376bfd4dc2d2526058b5c

Merge branch 'MDL-68845-master' of git://github.com/jleyva/moodle
---

9d5e79dbac425ce58e6376bfd4dc2d2526058b5c