From: Jake Dallimore <jake@moodle.com>
Date: Mon, 12 Oct 2020 01:50:56 +0000 (+0800)
Subject: Merge branch 'MDL-68406-master' of git://github.com/jleyva/moodle
X-Git-Tag: v4.0.0-beta~2160
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=411d12bc9c2c4e9ac3a4fa0d587dc339d98e7572

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

411d12bc9c2c4e9ac3a4fa0d587dc339d98e7572