Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 1 Jul 2016 02:20:11 +0000 (10:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 1 Jul 2016 02:20:11 +0000 (10:20 +0800)

Trivial merge