Merge branch 'MDL-69910-calendar-protectusername-MOODLE_310_STABLE' of https://github...
authorJake Dallimore <jake@moodle.com>
Mon, 12 Oct 2020 02:05:43 +0000 (10:05 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 12 Oct 2020 02:05:43 +0000 (10:05 +0800)

Trivial merge