Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Thu, 12 Apr 2018 12:38:11 +0000 (14:38 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 12 Apr 2018 12:38:11 +0000 (14:38 +0200)

Trivial merge