Pull changes from symfony:master