Merge branch 'MDL-57488-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2017 23:00:13 +0000 (00:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2017 23:00:13 +0000 (00:00 +0100)

Trivial merge