merged changes from CakePhp 2.1 branch
Ran update.sh on CakePhp 2.4.1 (test language)