Merge branch 'MDL-62935-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jul 2018 23:16:38 +0000 (01:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jul 2018 23:16:38 +0000 (01:16 +0200)

Trivial merge