Merge branch 'MDL-61998-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 00:39:17 +0000 (02:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 00:39:17 +0000 (02:39 +0200)

Trivial merge