Merge branch 'MDL-30811-fix2' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Mar 2016 15:36:03 +0000 (16:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Mar 2016 15:36:03 +0000 (16:36 +0100)

Trivial merge