Merge branch 'MDL-62925_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jul 2018 16:31:48 +0000 (18:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jul 2018 16:31:48 +0000 (18:31 +0200)

Trivial merge