Merge branch 'MDL-68766-M310' of https://github.com/michael-milette/moodle into MOODL...
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 21 Oct 2020 04:54:02 +0000 (12:54 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 21 Oct 2020 04:54:02 +0000 (12:54 +0800)

Trivial merge