Merge branch 'MDL-63329-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Sep 2018 08:19:19 +0000 (10:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Sep 2018 08:19:19 +0000 (10:19 +0200)

Trivial merge