Merge branch 'MDL-68860-39' of https://github.com/paulholden/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Aug 2020 23:08:32 +0000 (01:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Aug 2020 23:08:32 +0000 (01:08 +0200)

Trivial merge