Merge branch 'MDL-58874-master' of https://github.com/xow/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 May 2017 11:31:24 +0000 (13:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 May 2017 11:31:24 +0000 (13:31 +0200)

Trivial merge