Merge branch 'MDL-65656-master-2' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Jul 2019 00:16:35 +0000 (02:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Jul 2019 00:16:35 +0000 (02:16 +0200)

Trivial merge