Merge branch 'MDL-61895-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 21:57:46 +0000 (23:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 21:57:46 +0000 (23:57 +0200)

Trivial merge