Merge branch 'MDL-53896-master' of git://github.com/cameron1729/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 May 2016 11:36:45 +0000 (13:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 May 2016 11:36:45 +0000 (13:36 +0200)

Trivial merge