Merge branch 'MDL-69375_39' of https://github.com/Cvmcosta/moodle into MOODLE_39_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Aug 2020 03:51:08 +0000 (11:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Aug 2020 03:51:08 +0000 (11:51 +0800)

Trivial merge