Merge branch 'MDL-54916' of https://github.com/mr-russ/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Nov 2016 15:19:06 +0000 (16:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Nov 2016 15:19:06 +0000 (16:19 +0100)

Trivial merge