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

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

3c2c15d4dcd0dab22e84b4c198299b1f22fd0e52