Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorJake Dallimore <jake@moodle.com>
Fri, 13 Oct 2017 06:33:07 +0000 (14:33 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 13 Oct 2017 06:33:07 +0000 (14:33 +0800)

Trivial merge