Merge branch 'MDL-63842-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Nov 2018 15:03:16 +0000 (16:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Nov 2018 15:03:16 +0000 (16:03 +0100)

Trivial merge