Merge branch 'MDL-63435-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2018 21:47:52 +0000 (23:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2018 21:47:52 +0000 (23:47 +0200)

Trivial merge