Merge branch 'MDL-49005-master' of https://github.com/abias/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 20:48:28 +0000 (22:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 20:48:28 +0000 (22:48 +0200)

Trivial merge