Merge branch 'MDL-61743_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 17:23:01 +0000 (19:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 17:23:01 +0000 (19:23 +0200)

Trivial merge