Merge branch 'MDL-60249-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Nov 2017 23:48:41 +0000 (00:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Nov 2017 23:48:41 +0000 (00:48 +0100)

Trivial merge