Merge branch 'MDL-62070-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 20:13:47 +0000 (22:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 20:13:47 +0000 (22:13 +0200)

Trivial merge