Merge branch 'MDL-56090-master-fix' of github.com:andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Oct 2016 08:38:36 +0000 (10:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Oct 2016 08:38:36 +0000 (10:38 +0200)

Trivial merge