Merge branch 'master_MDL-42473' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Jan 2016 00:29:28 +0000 (01:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Jan 2016 00:29:28 +0000 (01:29 +0100)

Trivial merge