Merge branch 'MDL-60357-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Oct 2017 18:49:01 +0000 (20:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Oct 2017 18:49:01 +0000 (20:49 +0200)

Trivial merge