Merge branch 'MDL-62638-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 00:03:08 +0000 (02:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 00:03:08 +0000 (02:03 +0200)

Trivial merge