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

Trivial merge