Merge branch 'MDL-54656_m32v3' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 22:50:19 +0000 (00:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 22:50:19 +0000 (00:50 +0200)

Trivial merge