Merge branch 'MDL-64670-master' of git://github.com/aanabit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Mar 2019 16:47:59 +0000 (17:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Mar 2019 16:47:59 +0000 (17:47 +0100)

Trivial merge