Merge branch 'MDL-69475_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 19 Aug 2020 02:42:51 +0000 (10:42 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 19 Aug 2020 02:42:51 +0000 (10:42 +0800)

Trivial merge