Merge branch 'MDL-69414_M39' of https://github.com/nadavkav/moodle into MOODLE_39_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Aug 2020 06:52:46 +0000 (14:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Aug 2020 06:52:46 +0000 (14:52 +0800)

Trivial merge