Merge branch 'MDL-67687-master-2' of git://github.com/andrewnicols/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2020 22:59:15 +0000 (00:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2020 22:59:15 +0000 (00:59 +0200)

Trivial merge