Git merges in Moodle 2.3.10 by Damyon Wiese

commit 9f213270f601d2a0a29bdf14a4aba3ab93ef9c53
Author: Damyon Wiese <damyon@moodle.com>
Date:   Fri, 08 Nov 2013 12:48:04 +0800
Tag:    v2.3.10

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

commit b40036ac660b804dc4591c592e74c96069bac28b
Author: Damyon Wiese <damyon@moodle.com>
Date:   Mon, 28 Oct 2013 10:59:59 +0800
Tag:    v2.3.10

Merge branch 'MDL-36818-23' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE