Merge branch 'MDL-43230-master' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 20:35:53 +0000 (22:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 20:35:53 +0000 (22:35 +0200)

Trivial merge