Merge branch 'master' into install_master
authorAMOS bot <amos@moodle.org>
Thu, 28 May 2015 06:21:55 +0000 (14:21 +0800)
committerAMOS bot <amos@moodle.org>
Thu, 28 May 2015 06:21:55 +0000 (14:21 +0800)

Trivial merge