Merge branch 'MDL-29774-master-by-sam-wilson' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 15:34:36 +0000 (17:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 16:26:50 +0000 (18:26 +0200)

Trivial merge