Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jan 2017 04:17:44 +0000 (12:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jan 2017 04:17:44 +0000 (12:17 +0800)

Trivial merge