Merge branch 'MDL-63252-39' of git://github.com/lameze/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jul 2020 22:47:57 +0000 (00:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jul 2020 22:47:57 +0000 (00:47 +0200)

Trivial merge