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

Trivial merge