Merge branch 'MDL-67062-master-fix' of https://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 27 Feb 2020 11:54:30 +0000 (12:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 27 Feb 2020 11:54:30 +0000 (12:54 +0100)

Trivial merge