Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Wed, 25 Oct 2017 09:14:20 +0000 (11:14 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 25 Oct 2017 09:14:20 +0000 (11:14 +0200)

Trivial merge