Merge branch 'MDL-68889-39' of git://github.com/bmbrands/moodle into MOODLE_39_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Aug 2020 01:19:22 +0000 (09:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Aug 2020 01:19:22 +0000 (09:19 +0800)

Trivial merge