Merge branch 'MDL-67002_39' of https://github.com/timhunt/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Aug 2020 22:26:09 +0000 (00:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Aug 2020 22:26:09 +0000 (00:26 +0200)

Trivial merge