Merge branch 'master' into install_master
authorAMOS bot <amos@moodle.org>
Wed, 23 Nov 2016 16:06:13 +0000 (00:06 +0800)
committerAMOS bot <amos@moodle.org>
Wed, 23 Nov 2016 16:06:13 +0000 (00:06 +0800)

Trivial merge