Merge branch 'MDL-68061-master' of git://github.com/mickhawkins/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Mar 2020 21:56:13 +0000 (22:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Mar 2020 21:56:13 +0000 (22:56 +0100)

Trivial merge