Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorJake Dallimore <jake@moodle.com>
Fri, 23 Feb 2018 03:51:27 +0000 (11:51 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 23 Feb 2018 03:51:27 +0000 (11:51 +0800)

Trivial merge