Merge branch 'MDL-59931_master' of https://github.com/ctam/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Sep 2017 23:16:10 +0000 (01:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Sep 2017 23:16:10 +0000 (01:16 +0200)

Trivial merge