Merge branch 'MDL-68116-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Mar 2020 23:13:52 +0000 (00:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Mar 2020 23:13:52 +0000 (00:13 +0100)

Trivial merge