Merge branch 'MDL-65205-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Sep 2019 20:55:01 +0000 (22:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Sep 2019 20:55:01 +0000 (22:55 +0200)

Trivial merge