Merge branch 'MDL-65416-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 25 Apr 2019 21:43:32 +0000 (23:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 25 Apr 2019 21:43:32 +0000 (23:43 +0200)

Trivial merge