Merge branch 'MDL-60243-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Sep 2017 18:38:50 +0000 (20:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Sep 2017 18:38:50 +0000 (20:38 +0200)

Trivial merge