Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorJun Pataleta <jun@moodle.com>
Fri, 22 Dec 2017 01:41:55 +0000 (14:41 +1300)
committerJun Pataleta <jun@moodle.com>
Fri, 22 Dec 2017 01:41:55 +0000 (14:41 +1300)

Trivial merge