Merge branch 'MDL-60654' of https://github.com/joaociocca/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 00:16:40 +0000 (01:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 00:16:40 +0000 (01:16 +0100)

Trivial merge