Merge branch 'MDL-68766-master' of https://github.com/ised-isde-canada/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 21 Oct 2020 04:55:11 +0000 (12:55 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 21 Oct 2020 04:55:11 +0000 (12:55 +0800)

Trivial merge