Merge branch 'MDL-69553-m310' of https://github.com/NeillM/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Thu, 22 Oct 2020 06:56:05 +0000 (08:56 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 22 Oct 2020 06:56:05 +0000 (08:56 +0200)

Trivial merge