Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorJun Pataleta <jun@moodle.com>
Fri, 7 Apr 2017 04:45:44 +0000 (12:45 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 7 Apr 2017 04:45:44 +0000 (12:45 +0800)

Trivial merge