Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDavid Monllao <davidm@moodle.com>
Fri, 19 May 2017 05:11:12 +0000 (13:11 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 19 May 2017 05:11:12 +0000 (13:11 +0800)

Trivial merge