Merge branch 'MDL-64314-master-upgrade-fix' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Feb 2019 15:49:50 +0000 (16:49 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Feb 2019 15:49:50 +0000 (16:49 +0100)

Trivial merge