Merge branch 'MDL-56354' of https://github.com/mr-russ/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Oct 2016 00:16:10 +0000 (02:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Oct 2016 01:02:53 +0000 (03:02 +0200)

Trivial merge