Merge branch 'MDL-59638_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Aug 2017 17:48:17 +0000 (19:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Aug 2017 17:48:17 +0000 (19:48 +0200)

Trivial merge