Merge branch 'MDL-60105_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Sep 2017 23:55:12 +0000 (01:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Sep 2017 23:55:12 +0000 (01:55 +0200)

Trivial merge