Merge branch 'MDL-56595-39' of https://github.com/paulholden/moodle into MOODLE_39_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Aug 2020 03:36:04 +0000 (11:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Aug 2020 23:29:23 +0000 (07:29 +0800)

Trivial merge