Merge branch 'MDL-69214' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jul 2020 22:00:48 +0000 (00:00 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 16 Jul 2020 14:21:27 +0000 (16:21 +0200)

Trivial merge