Merge branch 'MDL-66900-39' of https://github.com/paulholden/moodle into MOODLE_39_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Aug 2020 23:54:30 +0000 (07:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Aug 2020 23:54:30 +0000 (07:54 +0800)

Trivial merge