Merge branch 'MDL-62448-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 15:29:06 +0000 (17:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 15:29:06 +0000 (17:29 +0200)

Trivial merge