Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Tue, 15 May 2018 07:42:47 +0000 (09:42 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 May 2018 07:42:47 +0000 (09:42 +0200)

Trivial merge