Merge branch 'MDL-64298-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Oct 2019 20:21:39 +0000 (22:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Oct 2019 20:21:39 +0000 (22:21 +0200)

Trivial merge