Merge branch 'MDL-67876' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Feb 2020 14:56:01 +0000 (15:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 14 Feb 2020 10:15:33 +0000 (11:15 +0100)

Trivial merge