Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 21 Jan 2016 05:43:32 +0000 (13:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 21 Jan 2016 05:43:32 +0000 (13:43 +0800)

Trivial merge