merge master into 2.2 to get symfony2.2 in branch 2.2