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

Trivial merge