Merge branch 'MDL-41312-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Jan 2018 01:02:54 +0000 (02:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Jan 2018 01:02:54 +0000 (02:02 +0100)

Trivial merge