Merge branch 'MDL-63524-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Mar 2019 22:37:48 +0000 (23:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 13 Mar 2019 22:37:48 +0000 (23:37 +0100)

Trivial merge