Merge branch 'MDL-63261-squashed' of https://github.com/Chocolate-lightning/moodle...
authorSara Arjona <sara@moodle.com>
Mon, 7 Sep 2020 05:30:03 +0000 (07:30 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 7 Sep 2020 05:30:03 +0000 (07:30 +0200)

Trivial merge