Git merges in Moodle 2.9.0 by Damyon Wiese

commit e362045e5893d54f7d1519759809e2c5bfd061f7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Apr 2015 21:42:39 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-49736_master' of git://github.com/markn86/moodle

commit 82d341cfd59b80a79e0d6f68749e7e8ca4e505b7
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Apr 2015 20:28:23 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-49503-master' of git://github.com/jleyva/moodle

commit 75ece778c5a760f79208065d118f2c9112878195
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Apr 2015 17:26:24 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle

commit 006fac90a17f487b853d487d1827b4f9eb95a8d8
Author: Damyon Wiese <damyon@moodle.com>
Date:   Tue, 07 Apr 2015 14:27:20 +0800
Tag:    v2.9.0-beta

Merge branch 'MDL-49498-master' of git://github.com/jleyva/moodle