Merge branch 'MDL-55000-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 17:35:56 +0000 (19:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 17:35:56 +0000 (19:35 +0200)

Trivial merge