Merge branch 'MDL-55362_master' of git://github.com/Chocolate-lightning/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2016 10:29:01 +0000 (11:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2016 10:29:01 +0000 (11:29 +0100)

Trivial merge