Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Mar 2017 19:30:32 +0000 (20:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Mar 2017 19:30:32 +0000 (20:30 +0100)

Trivial merge