Merge branch 'MDL-58781_master' of https://github.com/aanabit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2018 21:39:35 +0000 (23:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2018 21:39:35 +0000 (23:39 +0200)

Trivial merge