Merge branch 'MDL-68765-master' of https://github.com/ised-isde-canada/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 27 May 2020 04:49:39 +0000 (12:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 27 May 2020 04:49:39 +0000 (12:49 +0800)

Trivial merge