Git merges in Moodle 2.3.9 by Damyon Wiese

commit 6d1ebb59ddb07429c17fcc3d30c462a2a15f28fa
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 19 Jul 2013 09:22:18 +0800
Tag:    v2.3.9

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

commit e670f3e8c275a4c35f05710af1325ee9b681a72d
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 12 Jul 2013 09:42:35 +0800
Tag:    v2.3.9

Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE