Merge branch 'MDL-52383'
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Jan 2016 00:26:22 +0000 (01:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Jan 2016 00:26:22 +0000 (01:26 +0100)

Trivial merge