Merge branch 'MDL-39261-master' of https://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 12 Apr 2019 11:28:56 +0000 (13:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 12 Apr 2019 11:28:56 +0000 (13:28 +0200)

Trivial merge