Merge branch 'MDL-69695-310' of https://github.com/paulholden/moodle into MOODLE_310_...
authorSara Arjona <sara@moodle.com>
Mon, 28 Sep 2020 11:03:21 +0000 (13:03 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 28 Sep 2020 11:03:21 +0000 (13:03 +0200)

Trivial merge