Merge branch 'MDL-56880-m' of https://github.com/micaherne/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Nov 2016 11:04:25 +0000 (12:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Nov 2016 11:04:25 +0000 (12:04 +0100)

Trivial merge