Merge branch 'MDL-61566-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 15 Mar 2018 23:29:34 +0000 (00:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 15 Mar 2018 23:29:34 +0000 (00:29 +0100)

Trivial merge