Git merges in Moodle 3.0.0 by AMOS bot

commit 62bdf9b779a11b7f94201cca4b72ea11beab9c9c
Author: AMOS bot <amos@moodle.org>
Date:   Thu, 28 May 2015 14:21:55 +0800
Tag:    v3.0.0-beta

Merge branch 'master' into install_master


commit b8347ccafa71d1561fc102a5780a8fbf952518b6
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 22 May 2015 00:03:48 +0800
Tag:    v3.0.0-beta

Merge branch 'master' into install_master