Merge branch 'MDL-59774_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Aug 2017 09:58:00 +0000 (11:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Aug 2017 09:58:00 +0000 (11:58 +0200)

Trivial merge