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

Trivial merge