Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Fri, 10 Nov 2017 14:15:35 +0000 (15:15 +0100)
committerDavid Monllao <davidm@moodle.com>
Fri, 10 Nov 2017 14:15:35 +0000 (15:15 +0100)

Trivial merge