Merge branch 'MDL-64525-m310' of https://github.com/NeillM/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Tue, 1 Sep 2020 12:18:05 +0000 (14:18 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 1 Sep 2020 12:18:05 +0000 (14:18 +0200)

Trivial merge