Merge branch 'MDL-60944_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Feb 2019 17:46:44 +0000 (18:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Feb 2019 17:46:44 +0000 (18:46 +0100)

Trivial merge