Git merges in Moodle 2.4.11 by AMOS bot

commit e417377e897e31f7308b40e73e74b9ded0714a84
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 11 Jul 2014 08:44:37 +0800
Tag:    v2.4.11

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE