Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Thu, 29 Sep 2016 11:42:48 +0000 (12:42 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 29 Sep 2016 11:42:48 +0000 (12:42 +0100)

Trivial merge