Merge branch 'MDL-58435' of https://github.com/NeillM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Aug 2017 14:35:12 +0000 (16:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Aug 2017 14:35:12 +0000 (16:35 +0200)

Trivial merge