Merge branch 'MDL-62472-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 May 2018 16:29:46 +0000 (18:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 May 2018 16:29:46 +0000 (18:29 +0200)

Trivial merge