Merge branch 'MDL-49409-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Mar 2017 23:25:59 +0000 (01:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Mar 2017 23:25:59 +0000 (01:25 +0200)

Trivial merge