diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 9171ad5d0bfc..669f5e458c3e 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -14,10 +14,10 @@ Symfony2 is the result of the work of many people who made the code better
  - Christophe Coevoet (stof)
  - Pascal Borreli (pborreli)
  - Karma Dordrak (drak)
- - Ryan Weaver
  - Lukas Kahwe Smith (lsmith)
- - Jeremy Mikola (jmikola)
+ - Ryan Weaver
  - Joseph Bielawski (stloyd)
+ - Jeremy Mikola (jmikola)
  - Igor Wiedler (igorw)
  - Benjamin Eberlei (beberlei)
  - Jean-François Simon (jfsimon)
@@ -26,40 +26,42 @@ Symfony2 is the result of the work of many people who made the code better
  - Martin Hasoň (hason)
  - Jonathan Wage (jwage)
  - William Durand (couac)
+ - Jakub Zalas (jakubzalas)
  - Alexandre Salomé (alexandresalome)
  - ornicar
  - stealth35 ‏ (stealth35)
  - Alexander Mols (asm89)
- - Jakub Zalas (jakubzalas)
  - Bulat Shakirzyanov (avalanche123)
  - Francis Besset (francisbesset)
  - Henrik Bjørnskov (henrikbjorn)
  - Miha Vrhovnik
+ - Romain Neutron (romain)
  - Konstantin Kudryashov (everzet)
- - Саша Стаменковић (umpirsky)
- - Arnaud Le Blanc (arnaud-lb)
+ - Saša Stamenković (umpirsky)
  - Florin Patan (florinpatan)
- - Eric Clemmons (ericclemmons)
  - Bilal Amarni (bamarni)
+ - Arnaud Le Blanc (arnaud-lb)
+ - Eric Clemmons (ericclemmons)
+ - Dariusz Górecki (canni)
  - Henrik Westphal (snc)
- - Romain Neutron (romain)
  - Deni
- - Dariusz Górecki (canni)
  - Marc Weistroff (futurecat)
  - Jordan Alliot (jalliot)
  - Arnout Boks (aboks)
  - Hidenori Goto (hidenorigoto)
+ - Fran Moreno (franmomu)
  - Lee McDermott
  - Brandon Turner
  - Andrej Hudec (pulzarraider)
+ - Daniel Holmes (dholmes)
  - Brikou Carré (brikou)
  - John Wards (johnwards)
- - Fran Moreno (franmomu)
+ - Grégoire Pineau (lyrixx)
  - Antoine Hérault (herzult)
- - Daniel Holmes (dholmes)
+ - Bart van den Burg (burgov)
  - Tim Nagel (merk)
  - Włodzimierz Gajda (gajdaw)
- - Bart van den Burg (burgov)
+ - Michel Weimerskirch (mweimerskirch)
  - Christian Raue
  - Michal Piotrowski (eventhorizon)
  - Toni Uebernickel (havvg)
@@ -68,8 +70,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Fabien Pennequin (fabienpennequin)
  - excelwebzone
  - woodspire
- - Michel Weimerskirch (mweimerskirch)
- - Grégoire Pineau (lyrixx)
  - Mario A. Alvarez Garcia (nomack84)
  - Douglas Greenshields (shieldo)
  - Kevin Bond (kbond)
@@ -77,20 +77,21 @@ Symfony2 is the result of the work of many people who made the code better
  - Jacob Dreesen (jdreesen)
  - Richard Shank (iampersistent)
  - Sebastian Hörl (blogsh)
+ - Gábor Egyed (1ed)
+ - David Buchmann (dbu)
  - Juti Noppornpitak
  - Robert Schönthal (digitalkaoz)
  - Felix Labrecque
  - Michał Pipa (michal.pipa)
  - Gordon Franke (gimler)
  - Daniel Gomes (danielcsgomes)
- - Gábor Egyed (1ed)
  - Tigran Azatyan (tigranazatyan)
  - Pierre Minnieur (pminnieur)
  - Larry Garfield (crell)
  - Arnaud Kleinpeter (nanocom)
- - David Buchmann (dbu)
  - Jonathan Ingram (jonathaningram)
  - Sebastiaan Stok (sstok)
+ - Jérémie Augustin (jaugustin)
  - Javier Eguiluz (javier.eguiluz)
  - Matthieu Ouellette-Vachon (maoueh)
  - Amal Raghav (kertz)
@@ -103,16 +104,19 @@ Symfony2 is the result of the work of many people who made the code better
  - Benjamin Dulau (dbenjamin)
  - Andreas Hucks (meandmymonkey)
  - Noel Guilbert (noel)
- - Jérémie Augustin (jaugustin)
+ - Hiromi Hishida (77web)
+ - Guilherme Blanco (guilhermeblanco)
  - Martin Schuhfuß (usefulthink)
  - Thomas Rabaix (rande)
  - Dennis Benkert (denderello)
  - Marcel Beerta (mazen)
+ - Albert Casademont (acasademont)
  - Matthieu Bontemps (mbontemps)
  - fivestar
  - Dominique Bongiraud
  - Leszek Prabucki (l3l0)
  - Danny Berger (dpb587)
+ - Eric GELOEN (gelo)
  - Dustin Whittle (dustinwhittle)
  - jeff
  - Clemens Tolboom
@@ -120,15 +124,17 @@ Symfony2 is the result of the work of many people who made the code better
  - Sven Paulus (subsven)
  - Xavier Perez
  - Rui Marinho (ruimarinho)
+ - Dorian Villet (gnutix)
  - Ray
  - Joseph Rouff (rouffj)
- - Albert Casademont (acasademont)
- - Guilherme Blanco (guilhermeblanco)
  - Francois Zaninotto
+ - Alexander Kotynia (olden)
  - François Zaninotto (fzaninotto)
  - Xavier Montaña Carreras (xmontana)
  - Katsuhiro OGAWA
+ - Andréia Bohner (andreia)
  - Peter Kokot (maastermedia)
+ - Terje Bråten
  - Alif Rachmawadi
  - boombatower
  - Florian Klein (docteurklein)
@@ -138,6 +144,7 @@ Symfony2 is the result of the work of many people who made the code better
  - jdhoek
  - geoffrey
  - Wodor Wodorski
+ - Elnur Abdurrakhimov (elnur)
  - Matthew Lewinski (lewinski)
  - Kim Hemsø Rasmussen
  - Dirk Pahl (dirkaholic)
@@ -145,8 +152,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Gyula Sallai (salla)
  - Michael Holm (hollo)
  - Yaroslav Kiliba
- - Andréia Bohner (andreia)
- - Eric GELOEN (gelo)
  - Sebastian Bergmann
  - arjen
  - sun (sun)
@@ -158,7 +163,9 @@ Symfony2 is the result of the work of many people who made the code better
  - Tamas Szijarto
  - Thomas Adam
  - Grégoire Passault (gregwar)
+ - Uwe Jäger (uwej711)
  - Aurelijus Valeiša (aurelijus)
+ - Ait Boudad Abdellatif (aitboudad)
  - Gustavo Piltcher
  - Stepan Tanasiychuk (stfalcon)
  - Albert Jessurum (ajessu)
@@ -170,18 +177,25 @@ Symfony2 is the result of the work of many people who made the code better
  - Michel Salib (michelsalib)
  - Jeanmonod David (jeanmonod)
  - Thomas Lallement (raziel057)
+ - Ricard Clau (ricardclau)
  - Niklas Fiekas
+ - Konstantin Myakshin (koc)
+ - Wouter De Jong (wouterj)
+ - Manuel Reinhard (sprain)
  - Francesco Levorato
+ - Michele Orselli (orso)
  - Tom Van Looy (tvlooy)
  - Brouznouf
  - Peter Kruithof (pkruithof)
+ - Dmitrii Chekaliuk
+ - Matthias Pigulla (mpdude)
  - Greg Thornton (xdissent)
  - Lars Strojny
- - Terje Bråten
  - Costin Bereveanu (schniper)
  - Markus Lanthaler (lanthaler)
  - Jérôme Vieilledent (lolautruche)
  - realmfoo
+ - Pavel Volokitin (pvolok)
  - Tobias Naumann
  - Ismael Ambrosi (iambrosi)
  - Shein Alexey
@@ -192,19 +206,20 @@ Symfony2 is the result of the work of many people who made the code better
  - Laszlo Korte
  - Alessandro Desantis (alessandro1997)
  - hubert lecorche (hlecorche)
+ - Eugene Leonovich (rybakit)
  - Oscar Cubo Medina (ocubom)
+ - Karel Souffriau
  - Christophe L. (christophelau)
  - Michael Ridgway
  - Pavel Campr (pcampr)
+ - janschoenherr
  - Emanuele Gaspari (inmarelibero)
  - Brian King
- - Ricard Clau (ricardclau)
  - Jan Schumann
  - Erin Millard
+ - Antonio J. García Lagar (ajgarlag)
  - Olivier Dolbeau (odolbeau)
- - Konstantin Myakshin (koc)
- - Elnur Abdurrakhimov (elnur)
- - Michele Orselli (orso)
+ - Robert Kiss (kepten)
  - Asier Illarramendi (doup)
  - Javier López (loalf)
  - Chris Heng (gigablah)
@@ -214,12 +229,12 @@ Symfony2 is the result of the work of many people who made the code better
  - Marcin Sikoń (marphi)
  - Miquel Rodríguez Telep (mrtorrent)
  - Filippo Tessarotto
+ - Kristen Gilden (kgilden)
  - Adam Harvey
  - Laurent Bachelier (laurentb)
  - Fabian Lange (codingfabian)
  - Yoshio HANAWA
  - Tiago Brito (blackmx)
- - Hiromi Hishida (77web)
  - hossein zolfi (ocean)
  - Kevin McBride
  - Pablo Díez (pablodip)
@@ -234,20 +249,19 @@ Symfony2 is the result of the work of many people who made the code better
  - Vicent Soria Durá (vicentgodella)
  - Erik Trapman (eriktrapman)
  - De Cock Xavier (xdecock)
- - Manuel Reinhard (sprain)
  - Matthijs van den Bos
  - Joel Wurtz
- - Uwe Jäger (uwej711)
  - Nils Adermann (naderman)
+ - Gábor Fási
  - Leevi Graham
  - Michaël Perrin (michael.perrin)
  - sasezaki
  - Loïc Chardonnet (gnusat)
+ - Xavier HAUSHERR
  - Steven Surowiec
  - Marek Kalnik (marekkalnik)
  - Chris Smith
  - Anthon Pang
- - Eugene Leonovich
  - Ryan
  - Alexander Deruwe (aderuwe)
  - Ivan Rey (ivanrey)
@@ -259,9 +273,9 @@ Symfony2 is the result of the work of many people who made the code better
  - Zach Badgett (zachbadgett)
  - Aurélien Fredouelle
  - Karoly Negyesi (chx)
- - janschoenherr
  - Thomas Tourlourat (armetiz)
  - jamogon
+ - Miha Vrhovnik
  - Geoffrey Tran (geoff)
  - Florian Rey (nervo)
  - Maks
@@ -282,6 +296,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Chris Boden (cboden)
  - Roumen Damianoff (roumen)
  - Pierre du Plessis (pierredup)
+ - Josip Kruslin
  - Åsmund Garfors
  - Jeremy David (jeremy.david)
  - Tobias Sjösten (tobiassjosten)
@@ -295,7 +310,7 @@ Symfony2 is the result of the work of many people who made the code better
  - yktd26
  - Jakub Kucharovic
  - umpirski
- - Dmitrii Chekaliuk
+ - Antoine Corcy
  - cedric lombardot (cedriclombardot)
  - John Kary (johnkary)
  - Hossein Bukhamsin
@@ -327,16 +342,20 @@ Symfony2 is the result of the work of many people who made the code better
  - Josiah (josiah)
  - John Bohn (jbohn)
  - Nicolas Schwartz (nicoschwartz)
+ - Andrew Hilobok
  - Christian Soronellas Vallespí (theunic)
  - Benjamin Grandfond (benjamin)
  - Degory Valentine
  - Krzysiek Łabuś
+ - Andrew Udvare
  - Xavier Lacot (xavier)
  - Olivier Maisonneuve
  - Iwan van Staveren (istaveren)
  - cgonzalez
  - matt foster
  - Evan S Kaufman (evanskaufman)
+ - Iker Ibarguren (ikerib)
+ - Ricardo Oliveira (ricardolotr)
  - Jayson Xu (superjavason)
  - Jan Prieser
  - James Michael DuPont
@@ -346,6 +365,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Paul Kamer (pkamer)
  - Pierre Vanliefland (pvanliefland)
  - Martin Parsiegla (spea)
+ - Luis Cordova (cordoval)
  - Philipp Kräutli (pkraeutli)
  - Stefano Sala (stefano.sala)
  - frost-nzcr4
@@ -373,10 +393,12 @@ Symfony2 is the result of the work of many people who made the code better
  - Alexander Miehe (engerim)
  - Titouan Galopin (tgalopin)
  - Don Pinkster
+ - Maksim Muruev
  - Emil Einarsson
  - Thibault Duplessis
  - Marc Abramowitz
  - Martijn Evers
+ - alexpods
  - Mathias Rohnstock (drmonty)
  - Harry Walter (haswalt)
  - Michael Roterman (wtfzdotnet)
@@ -384,7 +406,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Adán Lobato (adanlobato)
  - Mikhail Yurasov
  - Sam Williams
- - Miha Vrhovnik
  - Moritz Borgmann
  - Daniel Cestari
  - Magnus Nordlander (magnusnordlander)
@@ -392,38 +413,47 @@ Symfony2 is the result of the work of many people who made the code better
  - LOUARDI Abdeltif (ouardisoft)
  - Robert Gruendler (pulse00)
  - ragtek (ragtek)
+ - Simon Terrien (sterrien)
  - Benoît Merlet (trompette)
  - Jan Behrens
  - Raul Fraile (raulfraile)
  - sensio
  - Théophile Helleboid - chtitux
+ - The Whole Life to Learn
  - xaav
  - Mahmoud Mostafa (mahmoud)
  - Juti Noppornpitak
  - Mei Gwilym
  - ttomor
  - Sander Coolen
- - Josip Kruslin
+ - Nicolas Le Goff (nlegoff)
  - Manuele Menozzi
  - Anton Babenko (antonbabenko)
  - Irmantas Šiupšinskas (irmantas)
  - dantleech
  - Tero Alén (tero)
  - Artem (digi)
+ - dantleech
  - Vadim Tyukov (vatson)
  - Sortex
  - arjenjb
  - chispita
  - Wojciech Sznapka
+ - Máximo Cuadros (mcuadros)
  - Alex Bogomazov
  - julien.galenski
  - Sébastien Lavoie
  - Per Sandström (per)
+ - Troy McCabe
  - Ville Mattila
+ - Sescandell (sescandell)
+ - Ben Davies
+ - Max Beutel
  - Marcos Quesada (marcos_quesada)
- - Robert Kiss (kepten)
+ - Dan Finnie
  - Vitaliy Tverdokhlib (vitaliytv)
  - Martijn Evers
+ - Benjamin Paap (benjaminpaap)
  - Sergii Smertin (nfx)
  - Eddie Jaoude
  - Nerijus Arlauskas
@@ -431,7 +461,6 @@ Symfony2 is the result of the work of many people who made the code better
  - SPolischook
  - Diego Sapriza
  - Joan Cruz
- - Antoine Corcy
  - inspiran
  - Cristobal Dabed
  - matteo giachino
@@ -441,17 +470,22 @@ Symfony2 is the result of the work of many people who made the code better
  - Vincent AUBERT (vincent)
  - Benoit Garret
  - DerManoMann
+ - Roland Franssen (ro0)
  - Jochen Bayer (jocl)
  - Jeremy Bush
  - Evan Villemez
+ - Péter Buri (burci)
  - Davide Borsatto (davide.borsatto)
  - kaiwa
  - Albert Ganiev (helios-ag)
  - Neil Katin
  - Gustavo Adrian
+ - Brooks Boyd
  - Roger Webb
  - Nicolas Fabre (nfabre)
+ - Felicitus
  - Paul Matthews
+ - Philipp Strube
  - Clement Herreman (clemherreman)
  - Marco
  - Alberto Aldegheri
@@ -460,22 +494,27 @@ Symfony2 is the result of the work of many people who made the code better
  - modi
  - Sergey Yuferev
  - Richard van den Brand (ricbra)
+ - Quique Porta
  - Aharon Perkel
  - Malaney J. Hill
  - Andy Cox (ringo)
  - Sebastian Göttschkes (sgoettschkes)
+ - erikaheidi
  - Pierre Tachoire
  - Ludek Stepan
  - Balázs Benyó (duplabe)
+ - Marc Morera (mmoreram)
  - Sebastian Utz
  - Keri Henare (kerihenare)
  - Cédric Lahouste (rapotor)
  - Anthony Ferrara
  - Janusz Jablonski
  - George Giannoulopoulos
+ - Chris Wilkinson (thewilkybarkid)
  - Ilya Biryukov
  - Lance McNearney
  - Alberto Pirovano (geezmo)
+ - Gabor Toth (tgabi333)
  - Xavier Briand (xavierbriand)
  - Evan Kaufman
  - Romain Geissler
@@ -484,6 +523,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Jay Severson
  - René Kerner
  - Adrien Samson (adriensamson)
+ - Samuel Gordalina (gordalina)
  - Martin Eckhardt
  - Michael Dowling (mtdowling)
  - Robert Queck
@@ -492,18 +532,23 @@ Symfony2 is the result of the work of many people who made the code better
  - Thomas Chmielowiec (chmielot)
  - Jānis Lukss
  - fdgdfg (psampaz)
+ - Maxwell Vandervelde
  - kaywalker
  - Sebastian Ionescu
  - Simon Neidhold
  - Kevin Dew
  - James Cowgill
+ - Patrik Gmitter (patie)
  - Thomas Ploch (tploch)
  - Benjamin Bender
  - Konrad Mohrfeldt
  - Benoit Lévêque (benoit_leveque)
+ - jskvara
  - Mephistofeles
  - pscheit
+ - Ramon Kleiss (akathos)
  - Nicolas Badey (nico-b)
+ - Vitaliy Zakharov (zakharovvi)
  - Gunnar Lium
  - povilas
  - Lars Strojny
@@ -511,6 +556,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Harm van Tilborg
  - Martin Eckhardt
  - Leonid Terentyev
+ - Przemysław Piechota (kibao)
  - Tom Adam (tomadam)
  - Francisco Facioni (fran6co)
  - Paweł Wacławczyk (pwc)
@@ -518,17 +564,16 @@ Symfony2 is the result of the work of many people who made the code better
  - 2manypeople
  - Thomas Bibb
  - Josef Cech
- - Ait Boudad Abdellatif (aitboudad)
  - Andrey Esaulov (andremaha)
  - hicham ELGUAROUANI (hiiimoo)
  - Stefan Koopmanschap (skoop)
  - Ivan Kurnosov
  - stloyd
+ - Andrew Coulton
  - Chris Tickner (tickner)
  - Luis Muñoz
  - Thomas Chmielowiec
  - Christoph Nissle (derstoffel)
- - Xavier HAUSHERR
  - Benjamin Zikarsky
  - Romain Dorgueil
  - Patrick Allaert
@@ -536,6 +581,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Andy Stanberry
  - alefranz
  - alsar
+ - Mike Meier
  - efeen
  - Bob den Otter (bopp)
  - Simone Fumagalli (hpatoio)
@@ -544,18 +590,24 @@ Symfony2 is the result of the work of many people who made the code better
  - Jordi Llonch (jordillonch)
  - Cédric Dugat (ph3nol)
  - Philip Dahlstrøm (phidah)
+ - Rénald Casagraude (rcasagraude)
  - Robin Duval (robin-duval)
  - Artem Lopata (bumz)
+ - Iltar van der Berg
  - Alexey Popkov
  - Artyom Protaskin
  - Nathanael d. Noblet
  - helmer
+ - Bram Van der Sype (brammm)
+ - Diego Saint Esteben (dii3g0)
  - Julien Moulin (lizjulien)
+ - dened
  - devel
  - gedrox
  - hirocaster
  - Andrey Chernykh
  - François Pluchino
+ - Alexey Prilipko
  - Jörn Lang (j.lang)
  - Jan Marek (janmarek)
  - Dan Patrick (mdpatrick)
@@ -579,6 +631,9 @@ Symfony2 is the result of the work of many people who made the code better
  - Robert Campbell
  - Matt Lehner
  - cyrillej
+ - Alex Pods
+ - timaschew
+ - Christian Morgan
  - Haritz
  - Grummfy
  - Rowan Manning
@@ -598,10 +653,10 @@ Symfony2 is the result of the work of many people who made the code better
  - ddebree
  - Alex
  - Klaas Naaijkens
- - Alexander Kotynia
  - Rafał
  - Masao Maeda (brtriver)
  - Dave Marshall (davedevelopment)
+ - David Marín Carreño (davefx)
  - Denis Klementjev (dklementjev)
  - Kévin Dunglas (dunglas)
  - Vincent Composieux (eko)
@@ -610,7 +665,6 @@ Symfony2 is the result of the work of many people who made the code better
  - giulio de donato (liuggio)
  - Matthew Davis (mdavis1982)
  - Muriel Lusseau (metalmumu)
- - Matthias Pigulla (mpdude)
  - Pablo Monterde Perez (plebs)
  - Jimmy Leger (redpanda)
  - Baptiste Clavié (talus)
@@ -637,7 +691,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Christian Eikermann
  - Vladimir Sazhin
  - Vyacheslav Slinko
- - Maksim Muruev
  - Johannes
  - Jörg Rühl
  - patrick-mcdougle
@@ -667,7 +720,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Sergiy Sokolenko
  - dinitrol
  - Penny Leach
- - Gábor Fási
  - oscartv
  - Philipp Rieber
  - DanSync
@@ -678,6 +730,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Christian Stocker
  - dorkitude
  - tirnanog06
+ - phc
  - Besnik Br
  - sualko
  - Nicolas Roudaire
@@ -686,7 +739,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Bernd Matzner (bmatzner)
  - Chris Sedlmayr (catchamonkey)
  - Kousuke Ebihara (co3k)
- - Luis Cordova (cordoval)
  - Christoph Schaefer (cvschaefer)
  - Damien Alexandre (damienalexandre)
  - Damon Jones (damon__jones)
@@ -713,7 +765,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Ruud Kamphuis (ruudk)
  - Sarah Khalil (saro0h)
  - Sebastian Busch (sebu)
- - Simon Terrien (sterrien)
  - Markus Tacker (tacker)
  - Tyler Stroud (tystr)
  - Víctor Mateo (victormateo)
@@ -737,3 +788,4 @@ Symfony2 is the result of the work of many people who made the code better
  - Erik Saunier (snickers)
  - Tony Piper (tonypiper)
  - Vladislav Vlastovskiy (vlastv)
+ - Christian Flothmann (xabbuh)