Merge branch 'MDL-61869_master' of https://github.com/marxjohnson/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2018 00:26:24 +0000 (02:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2018 00:26:24 +0000 (02:26 +0200)

Trivial merge