Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Thu, 8 Jun 2017 11:16:16 +0000 (12:16 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 8 Jun 2017 11:16:16 +0000 (12:16 +0100)

Trivial merge