Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Wed, 8 Nov 2017 08:47:38 +0000 (09:47 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 8 Nov 2017 08:47:38 +0000 (09:47 +0100)

Trivial merge