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

Trivial merge