Merge branch 'master-MDL-66716' of https://github.com/golenkovm/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Aug 2020 18:09:40 +0000 (20:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Aug 2020 18:09:40 +0000 (20:09 +0200)

Trivial merge