Merge branches 'master' and 'symfony-2-3' into symfony-2-3
Updated composer
Merge branches 'symfony-2-3' and 'master'