Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Thu, 24 May 2018 08:47:50 +0000 (10:47 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 24 May 2018 08:47:50 +0000 (10:47 +0200)

Trivial merge