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

Trivial merge