Merge branch 'MDL-43176' of https://github.com/NeillM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Sep 2017 21:10:31 +0000 (23:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Sep 2017 21:10:31 +0000 (23:10 +0200)

Trivial merge