Merge branch 'MDL-65695-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 May 2019 08:48:25 +0000 (10:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 May 2019 08:48:25 +0000 (10:48 +0200)

Trivial merge