Merge branch 'MDL-62387-310' of https://github.com/paulholden/moodle into MOODLE_310_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Sep 2020 22:09:42 +0000 (00:09 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 17 Sep 2020 07:17:23 +0000 (09:17 +0200)

Trivial merge