Merge branch 'MDL-41265-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 01:06:47 +0000 (03:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 01:06:47 +0000 (03:06 +0200)

Trivial merge