Merge branch 'MDL-68860' of https://github.com/paulholden/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Aug 2020 22:55:09 +0000 (00:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Aug 2020 22:55:09 +0000 (00:55 +0200)

Trivial merge