Merge branch 'MDL-67641-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Mar 2020 09:47:45 +0000 (10:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Mar 2020 09:47:45 +0000 (10:47 +0100)

Trivial merge