Git merges in Moodle 3.7.9 by Jun Pataleta

commit 26a7f1ed03f739d50dd1f7b74d2ff53e51f52f6e
Author: Jun Pataleta <jun@moodle.com>
Date:   Wed, 28 Oct 2020 14:18:47 +0800
Tag:    v3.7.9

Merge branch 'MDL-69815-37' of git://github.com/andrewnicols/moodle into MOODLE_37_STABLE