Merge branch 'MDL-62961_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jul 2018 23:24:34 +0000 (01:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jul 2018 23:24:34 +0000 (01:24 +0200)

Trivial merge