Merge branch 'MDL-62344-master-final' of https://github.com/Tsheke/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jul 2018 21:53:52 +0000 (23:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jul 2018 21:53:52 +0000 (23:53 +0200)

Trivial merge