Changed symfony version to 1.4.20 in prepare_tests.sh
Merge remote-tracking branch 'upstream/master'