Merge branch 'MDL-59661_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Aug 2017 23:41:29 +0000 (01:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Aug 2017 23:41:29 +0000 (01:41 +0200)

Trivial merge