Merge branch 'MDL-59741-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Aug 2017 00:34:11 +0000 (02:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Aug 2017 00:34:11 +0000 (02:34 +0200)

Trivial merge