Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Thu, 12 Jan 2017 07:42:24 +0000 (07:42 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 12 Jan 2017 07:42:24 +0000 (07:42 +0000)

Trivial merge