Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Thu, 4 Jan 2018 10:02:33 +0000 (11:02 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 4 Jan 2018 10:02:33 +0000 (11:02 +0100)

Trivial merge