Merge branch 'MDL-61860-master' of https://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Apr 2018 23:00:31 +0000 (01:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Apr 2018 23:00:31 +0000 (01:00 +0200)

Trivial merge