Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Fri, 6 Jan 2017 01:30:48 +0000 (01:30 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 6 Jan 2017 01:30:48 +0000 (01:30 +0000)

Trivial merge