From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 19 Aug 2020 23:44:12 +0000 (+0800)
Subject: Merge branch 'MDL-69473-39' of git://github.com/sarjona/moodle into MOODLE_39_STABLE
X-Git-Tag: v3.9.2~69
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=2cb5248ac3fafd4101e8e8b875dc82908c6e7598

Merge branch 'MDL-69473-39' of git://github.com/sarjona/moodle into MOODLE_39_STABLE
---

2cb5248ac3fafd4101e8e8b875dc82908c6e7598