Merge branch 'MDL-56316-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 16:11:56 +0000 (18:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 16:11:56 +0000 (18:11 +0200)

Trivial merge