Merge branch 'MDL-61621_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2018 10:57:38 +0000 (12:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2018 10:57:38 +0000 (12:57 +0200)

Trivial merge