Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Fri, 14 Jul 2017 10:46:42 +0000 (11:46 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 14 Jul 2017 10:46:42 +0000 (11:46 +0100)

Trivial merge