Merge branch 'MDL-64990_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2019 22:03:56 +0000 (23:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2019 22:03:56 +0000 (23:03 +0100)

Trivial merge