Merge branch 'MDL-58754-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 May 2017 17:32:45 +0000 (19:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 May 2017 17:32:45 +0000 (19:32 +0200)

Trivial merge