Merge branch 'MDL-65056-master' of https://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Apr 2019 18:12:54 +0000 (20:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Apr 2019 18:12:54 +0000 (20:12 +0200)

Trivial merge