Merge branch 'MDL-64664-master' of git://github.com/cescobedo/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2019 21:58:27 +0000 (22:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2019 21:58:27 +0000 (22:58 +0100)

Trivial merge