Merge branch 'MDL-62408_master' of https://github.com/marxjohnson/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 27 May 2018 23:40:07 +0000 (01:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 27 May 2018 23:40:07 +0000 (01:40 +0200)

Trivial merge