Merge branch 'MDL-61475-master-v3' of git://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Mar 2018 10:00:57 +0000 (11:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Mar 2018 10:00:57 +0000 (11:00 +0100)

Trivial merge