Merge branch 'MDL-61576-master' of git://github.com/cescobedo/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Mar 2018 21:19:55 +0000 (23:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:12:48 +0000 (18:12 +0200)

Trivial merge