Merge branch 'MDL-55405-master' of git://github.com/cameron1729/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Sep 2016 10:21:37 +0000 (12:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Sep 2016 10:21:37 +0000 (12:21 +0200)

Trivial merge