Merge branch 'MDL-53991_m33v4' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Feb 2017 17:12:39 +0000 (18:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Feb 2017 17:12:39 +0000 (18:12 +0100)

Trivial merge