From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 8 Jul 2020 01:38:46 +0000 (+0800)
Subject: Merge branch 'MDL-69031-master' of git://github.com/jleyva/moodle
X-Git-Tag: v3.10.0-beta~436
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=7d4ee9c50b7d7503553f9a488a313f5d75401d86;hp=--cc

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

7d4ee9c50b7d7503553f9a488a313f5d75401d86