Merge branch 'MDL-57572-master' of https://github.com/mwehr/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jan 2017 18:25:44 +0000 (19:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jan 2017 18:25:44 +0000 (19:25 +0100)

Trivial merge