Merge branch 'MDL-62571_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Jun 2018 23:49:05 +0000 (01:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Jun 2018 23:49:05 +0000 (01:49 +0200)

Trivial merge