Merge branch 'MDL-55937-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Aug 2017 21:17:24 +0000 (23:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Aug 2017 21:17:24 +0000 (23:17 +0200)

Trivial merge