From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 1 Sep 2020 02:59:51 +0000 (+0800)
Subject: Merge branch 'MDL-69387-39-2' of git://github.com/junpataleta/moodle into MOODLE_39_S... 
X-Git-Tag: v3.9.2~38
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=5ad20a0633cef4aad3061b258cadd4b1d7492ee7

Merge branch 'MDL-69387-39-2' of git://github.com/junpataleta/moodle into MOODLE_39_STABLE
---

5ad20a0633cef4aad3061b258cadd4b1d7492ee7