Merge branch 'MDL-63130_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Sep 2018 21:55:00 +0000 (23:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Sep 2018 21:55:00 +0000 (23:55 +0200)

Trivial merge