Merge branch 'MDL-62433-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 21:30:46 +0000 (23:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 21:30:46 +0000 (23:30 +0200)

Trivial merge