Merge branch 'MDL-55124' of https://github.com/mr-russ/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 21 Sep 2016 22:52:30 +0000 (00:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 21 Sep 2016 22:52:30 +0000 (00:52 +0200)

Trivial merge