Merge branch 'MDL-61993-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 22:56:42 +0000 (00:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 22:56:42 +0000 (00:56 +0200)

Trivial merge