Merge to symfony 2.3