Merge branch 'MDL-60301-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Oct 2017 22:37:11 +0000 (00:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Oct 2017 22:37:11 +0000 (00:37 +0200)

Trivial merge