Merge branch 'MDL-56100-master' of https://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 20:58:11 +0000 (22:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 20:58:11 +0000 (22:58 +0200)

Trivial merge