Merge branch 'wip-MDL-57234-master' of https://github.com/Beedell/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Dec 2016 16:58:51 +0000 (17:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Dec 2016 16:58:51 +0000 (17:58 +0100)

Trivial merge