Merge branch 'master' into install_master
authorAMOS bot <amos@moodle.org>
Thu, 21 May 2015 16:03:48 +0000 (00:03 +0800)
committerAMOS bot <amos@moodle.org>
Thu, 21 May 2015 16:03:48 +0000 (00:03 +0800)

Trivial merge