Merge branch 'MDL-60630-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Sep 2018 21:14:54 +0000 (23:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Sep 2018 21:14:54 +0000 (23:14 +0200)

Trivial merge