Merge branch 'MDL-63456-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Oct 2018 22:15:46 +0000 (00:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Oct 2018 22:15:46 +0000 (00:15 +0200)

Trivial merge