Merge branch 'MDL-68892-39' of git://github.com/ferranrecio/moodle into MOODLE_39_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Sep 2020 01:49:21 +0000 (09:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Sep 2020 01:49:21 +0000 (09:49 +0800)

Trivial merge