Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 3 Jun 2016 04:09:16 +0000 (12:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 3 Jun 2016 04:09:16 +0000 (12:09 +0800)

Trivial merge