Merge branch 'MDL-65257_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Apr 2019 22:03:07 +0000 (00:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Apr 2019 18:47:08 +0000 (20:47 +0200)

Trivial merge