Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Aug 2017 08:39:10 +0000 (10:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Aug 2017 08:39:10 +0000 (10:39 +0200)

Trivial merge