Merge branch 'MDL-55867_m33v1' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2017 23:52:20 +0000 (00:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2017 23:52:20 +0000 (00:52 +0100)

Trivial merge