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

Trivial merge