Merge branch 'MDL-63960-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 10 Nov 2018 09:27:35 +0000 (10:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 10 Nov 2018 09:27:35 +0000 (10:27 +0100)

Trivial merge