Merge branch 'master' into install_master
authorAMOS bot <amos@moodle.org>
Fri, 23 Jun 2017 16:08:36 +0000 (00:08 +0800)
committerAMOS bot <amos@moodle.org>
Fri, 23 Jun 2017 16:08:36 +0000 (00:08 +0800)

Trivial merge