Merge branch 'MDL-62288_master' of https://bitbucket.org/ujiapps/moodle-uji
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 23:20:08 +0000 (01:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 23:20:08 +0000 (01:20 +0200)

Trivial merge