Merge branch 'MDL-59047-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jun 2018 01:04:35 +0000 (03:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jun 2018 01:04:35 +0000 (03:04 +0200)

Trivial merge