Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorJun Pataleta <jun@moodle.com>
Thu, 29 Mar 2018 04:55:37 +0000 (12:55 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 29 Mar 2018 04:55:37 +0000 (12:55 +0800)

Trivial merge