Merge branch 'MDL-42012-310-alt' of git://github.com/andrewnicols/moodle into MOODLE_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Sep 2020 21:28:54 +0000 (23:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Sep 2020 21:28:54 +0000 (23:28 +0200)

Trivial merge