Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Oct 2018 14:20:21 +0000 (16:20 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Oct 2018 14:20:21 +0000 (16:20 +0200)

Trivial merge