Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorJake Dallimore <jake@moodle.com>
Thu, 16 Nov 2017 03:13:28 +0000 (11:13 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 16 Nov 2017 03:13:28 +0000 (11:13 +0800)

Trivial merge