Merge branch 'MDL-69214-39' of https://github.com/paulholden/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jul 2020 22:01:19 +0000 (00:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jul 2020 22:01:19 +0000 (00:01 +0200)

Trivial merge