Git merges in Moodle 2.4.9 by AMOS bot

commit fbc50fb6996c31c813003428e6bd0909ca3aa075
Author: AMOS bot <amos@moodle.org>
Date:   Fri, 07 Mar 2014 08:54:52 +0800
Tag:    v2.4.9

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE