Merge branch 'MDL-60302-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Oct 2017 19:14:54 +0000 (21:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Oct 2017 19:14:54 +0000 (21:14 +0200)

Trivial merge