Merge branch 'wip-MDL-48629-master' of https://github.com/Beedell/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 23:58:31 +0000 (01:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 23:58:31 +0000 (01:58 +0200)

Trivial merge