Merge branch 'MDL-61215-39' of git://github.com/sarjona/moodle into MOODLE_39_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Aug 2020 23:17:13 +0000 (07:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Aug 2020 23:17:13 +0000 (07:17 +0800)

Trivial merge