Merge branch 'MDL-54663-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 11:26:34 +0000 (13:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 11:26:34 +0000 (13:26 +0200)

Trivial merge