Preparing the update from symfony-docs (2.1)