Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Apr 2018 17:54:24 +0000 (19:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Apr 2018 17:54:24 +0000 (19:54 +0200)

Trivial merge