Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Fri, 12 May 2017 09:02:40 +0000 (10:02 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 12 May 2017 09:02:40 +0000 (10:02 +0100)

Trivial merge