Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 4 Aug 2017 03:49:24 +0000 (11:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 4 Aug 2017 03:49:24 +0000 (11:49 +0800)

Trivial merge