Merge branch 'MDL-56436-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 09:21:31 +0000 (11:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 09:21:31 +0000 (11:21 +0200)

Trivial merge