php5.5 compat again
Merge branch '1.4' of github.com:b1rdex/symfony1 into 1.4
Merge branch '1.4' of github.com:b1rdex/symfony1 into 1.4