diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index ced9b18126..450e53dbc0 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -18,9 +18,9 @@ Symfony is the result of the work of many people who made the code better
  - Kévin Dunglas (dunglas)
  - Ryan Weaver (weaverryan)
  - Javier Eguiluz (javier.eguiluz)
- - Hugo Hamon (hhamon)
  - Maxime Steinhausser (ogizanagi)
  - Robin Chalas (chalas_r)
+ - Hugo Hamon (hhamon)
  - Abdellatif Ait boudad (aitboudad)
  - Grégoire Pineau (lyrixx)
  - Romain Neutron (romain)
@@ -31,10 +31,10 @@ Symfony is the result of the work of many people who made the code better
  - Lukas Kahwe Smith (lsmith)
  - Martin Hasoň (hason)
  - Jeremy Mikola (jmikola)
+ - Roland Franssen (ro0)
  - Jean-François Simon (jfsimon)
  - Benjamin Eberlei (beberlei)
  - Igor Wiedler (igorw)
- - Roland Franssen (ro0)
  - Eriksen Costa (eriksencosta)
  - Jules Pietri (heah)
  - Guilhem Niot (energetick)
@@ -47,39 +47,42 @@ Symfony is the result of the work of many people who made the code better
  - Francis Besset (francisbesset)
  - stealth35 ‏ (stealth35)
  - Alexander Mols (asm89)
- - Bulat Shakirzyanov (avalanche123)
  - Iltar van der Berg (kjarli)
+ - Bulat Shakirzyanov (avalanche123)
  - Peter Rehm (rpet)
  - Saša Stamenković (umpirsky)
  - Henrik Bjørnskov (henrikbjorn)
  - Miha Vrhovnik
+ - Matthias Pigulla (mpdude)
  - Diego Saint Esteben (dii3g0)
  - Konstantin Kudryashov (everzet)
- - Matthias Pigulla (mpdude)
  - Bilal Amarni (bamarni)
  - Florin Patan (florinpatan)
- - Gábor Egyed (1ed)
+ - Dany Maillard (maidmaid)
+ - Jérémy DERUSSÉ (jderusse)
  - Kevin Bond (kbond)
- - Andrej Hudec (pulzarraider)
+ - Yonel Ceruto (yonelceruto)
+ - Gábor Egyed (1ed)
  - Pierre du Plessis (pierredup)
+ - Andrej Hudec (pulzarraider)
  - Michel Weimerskirch (mweimerskirch)
  - Eric Clemmons (ericclemmons)
  - Charles Sarrazin (csarrazi)
  - Konstantin Myakshin (koc)
  - Christian Raue
- - Dany Maillard (maidmaid)
+ - Jáchym Toušek (enumag)
  - Arnout Boks (aboks)
- - Jérémy DERUSSÉ (jderusse)
  - Deni
+ - Alexander M. Turek (derrabus)
  - Henrik Westphal (snc)
  - Dariusz Górecki (canni)
- - Jáchym Toušek (enumag)
  - Titouan Galopin (tgalopin)
  - Douglas Greenshields (shieldo)
  - Lee McDermott
  - Brandon Turner
  - Luis Cordova (cordoval)
  - Graham Campbell (graham)
+ - Tobias Nyholm (tobias)
  - Daniel Holmes (dholmes)
  - Toni Uebernickel (havvg)
  - Bart van den Burg (burgov)
@@ -87,16 +90,13 @@ Symfony is the result of the work of many people who made the code better
  - Jérôme Tamarelle (gromnan)
  - John Wards (johnwards)
  - Dariusz Ruminski
- - Alexander M. Turek (derrabus)
  - Fran Moreno (franmomu)
- - Antoine Hérault (herzult)
- - Tobias Nyholm (tobias)
- - Paráda József (paradajozsef)
  - Issei Murasawa (issei_m)
+ - Antoine Hérault (herzult)
+ - Paráda József (paradajozsef)
  - Arnaud Le Blanc (arnaud-lb)
  - Maxime STEINHAUSSER
  - Michal Piotrowski (eventhorizon)
- - Yonel Ceruto González (yonelceruto)
  - Tim Nagel (merk)
  - Brice BERNARD (brikou)
  - Baptiste Clavié (talus)
@@ -142,6 +142,7 @@ Symfony is the result of the work of many people who made the code better
  - Mikael Pajunen
  - Joel Wurtz (brouznouf)
  - Jérôme Vasseur (jvasseur)
+ - Oleg Voronkovich
  - Grégoire Paris (greg0ire)
  - Philipp Wahala (hifi)
  - Vyacheslav Pavlov
@@ -152,7 +153,6 @@ Symfony is the result of the work of many people who made the code better
  - Rouven Weßling (realityking)
  - Teoh Han Hui (teohhanhui)
  - Clemens Tolboom
- - Oleg Voronkovich
  - Helmer Aaviksoo
  - Lars Strojny (lstrojny)
  - Hiromi Hishida (77web)
@@ -170,10 +170,12 @@ Symfony is the result of the work of many people who made the code better
  - Clément JOBEILI (dator)
  - Possum
  - Dorian Villet (gnutix)
+ - Sergey Linnik (linniksa)
  - Richard Miller (mr_r_miller)
  - Julien Falque (julienfalque)
  - Mario A. Alvarez Garcia (nomack84)
  - Dennis Benkert (denderello)
+ - SpacePossum
  - Benjamin Dulau (dbenjamin)
  - Mathieu Lemoine (lemoinem)
  - Christian Schmidt
@@ -206,19 +208,20 @@ Symfony is the result of the work of many people who made the code better
  - Sven Paulus (subsven)
  - Rui Marinho (ruimarinho)
  - Marek Štípek (maryo)
- - SpacePossum
  - Eugene Wissner
  - Julien Brochet (mewt)
  - Tristan Darricau (nicofuma)
- - Sergey Linnik (linniksa)
  - Michaël Perrin (michael.perrin)
  - Marcel Beerta (mazen)
  - Loïc Faugeron
  - Jannik Zschiesche (apfelbox)
+ - Hidde Wieringa (hiddewie)
  - Marco Pivetta (ocramius)
+ - Rob Frawley 2nd (robfrawley)
  - julien pauli (jpauli)
  - Lorenz Schori
  - Sébastien Lavoie (lavoiesl)
+ - Gregor Harlan (gharlan)
  - Francois Zaninotto
  - Alexander Kotynia (olden)
  - Daniel Tschinder
@@ -262,8 +265,7 @@ Symfony is the result of the work of many people who made the code better
  - Pavel Batanov (scaytrase)
  - Nikita Konstantinov
  - Wodor Wodorski
- - Rob Frawley 2nd (robfrawley)
- - Gregor Harlan (gharlan)
+ - Oskar Stark (oskarstark)
  - Thomas Lallement (raziel057)
  - Giorgio Premi
  - Matthieu Napoli (mnapoli)
@@ -274,11 +276,12 @@ Symfony is the result of the work of many people who made the code better
  - Antonio J. García Lagar (ajgarlag)
  - Kim Hemsø Rasmussen (kimhemsoe)
  - Wouter Van Hecke
+ - Jérôme Parmentier (lctrs)
  - Peter Kruithof (pkruithof)
  - Michael Holm (hollo)
  - Marc Weistroff (futurecat)
  - Christian Schmidt
- - Hidde Wieringa (hiddewie)
+ - Amrouche Hamza
  - Chad Sikorra (chadsikorra)
  - Chris Smith (cs278)
  - Florian Klein (docteurklein)
@@ -315,6 +318,7 @@ Symfony is the result of the work of many people who made the code better
  - Thierry Thuon (lepiaf)
  - Ricard Clau (ricardclau)
  - Mark Challoner (markchalloner)
+ - Dariusz
  - Gennady Telegin (gtelegin)
  - Ben Davies (bendavies)
  - Erin Millard
@@ -334,7 +338,6 @@ Symfony is the result of the work of many people who made the code better
  - Damien Alexandre (damienalexandre)
  - Felix Labrecque
  - Yaroslav Kiliba
- - Amrouche Hamza
  - Terje Bråten
  - Robbert Klarenbeek (robbertkl)
  - Thomas Calvet (fancyweb)
@@ -344,6 +347,7 @@ Symfony is the result of the work of many people who made the code better
  - David Badura (davidbadura)
  - hossein zolfi (ocean)
  - Clément Gautier (clementgautier)
+ - Sanpi
  - Eduardo Gulias (egulias)
  - giulio de donato (liuggio)
  - ShinDarth
@@ -389,7 +393,6 @@ Symfony is the result of the work of many people who made the code better
  - Karel Souffriau
  - Christophe L. (christophelau)
  - Anthon Pang (robocoder)
- - Jérôme Parmentier (lctrs)
  - Emanuele Gaspari (inmarelibero)
  - Sébastien Santoro (dereckson)
  - Brian King
@@ -397,8 +400,10 @@ Symfony is the result of the work of many people who made the code better
  - Michel Salib (michelsalib)
  - geoffrey
  - Steffen Roßkamp
+ - Alexandru Furculita (afurculita)
  - Valentin Jonovs (valentins-jonovs)
  - Jeanmonod David (jeanmonod)
+ - Christopher Davis (chrisguitarguy)
  - Jan Schumann
  - Niklas Fiekas
  - Markus Bachmann (baachi)
@@ -424,9 +429,11 @@ Symfony is the result of the work of many people who made the code better
  - Dirk Pahl (dirkaholic)
  - cedric lombardot (cedriclombardot)
  - Jonas Flodén (flojon)
+ - Thomas Perez (scullwm)
  - Marcin Sikoń (marphi)
  - Dominik Zogg (dominik.zogg)
  - Marek Pietrzak
+ - Luc Vieillescazes (iamluc)
  - franek (franek)
  - Christian Wahler
  - Gintautas Miselis
@@ -434,8 +441,8 @@ Symfony is the result of the work of many people who made the code better
  - Zander Baldwin
  - Adam Harvey
  - Maxime Veber (nek-)
- - Sanpi
  - Alex Bakhturin
+ - Yanick Witschi (toflar)
  - Alexander Obuhovich (aik099)
  - boombatower
  - Fabrice Bernhard (fabriceb)
@@ -463,6 +470,7 @@ Symfony is the result of the work of many people who made the code better
  - ondrowan
  - Barry vd. Heuvel (barryvdh)
  - Wouter J
+ - Florent Mata
  - Evan S Kaufman (evanskaufman)
  - mcben
  - Jérôme Vieilledent (lolautruche)
@@ -499,7 +507,6 @@ Symfony is the result of the work of many people who made the code better
  - sasezaki
  - Dawid Pakuła (zulusx)
  - Florian Rey (nervo)
- - Oskar Stark (oskarstark)
  - Rodrigo Borrego Bernabé (rodrigobb)
  - MatTheCat
  - Denis Gorbachev (starfall)
@@ -534,13 +541,13 @@ Symfony is the result of the work of many people who made the code better
  - Mantas Var (mvar)
  - Sebastian Krebs
  - Jean-Christophe Cuvelier [Artack]
- - Christopher Davis (chrisguitarguy)
  - alcaeus
  - vitaliytv
  - Sebastian Blum
  - aubx
  - Marvin Butkereit
  - Ricky Su (ricky)
+ - Zan Baldwin
  - Gildas Quéméner (gquemener)
  - Charles-Henri Bruyand
  - Max Rath (drak3)
@@ -579,8 +586,8 @@ Symfony is the result of the work of many people who made the code better
  - Vincent Simonin
  - Alex Bogomazov (alebo)
  - maxime.steinhausser
+ - adev
  - Stefan Warman
- - Thomas Perez (scullwm)
  - Tristan Maindron (tmaindron)
  - Wesley Lancel
  - Ke WANG (yktd26)
@@ -593,7 +600,6 @@ Symfony is the result of the work of many people who made the code better
  - Chris Heng (gigablah)
  - Richard Bradley
  - Ulumuddin Yunus (joenoez)
- - Luc Vieillescazes (iamluc)
  - Johann Saunier (prophet777)
  - Michael Devery (mickadoo)
  - Antoine Corcy
@@ -610,6 +616,7 @@ Symfony is the result of the work of many people who made the code better
  - Cameron Porter
  - Hossein Bukhamsin
  - Oliver Hoff
+ - Martin Auswöger
  - Disparity
  - origaminal
  - Matteo Beccati (matteobeccati)
@@ -625,6 +632,7 @@ Symfony is the result of the work of many people who made the code better
  - Tiago Brito (blackmx)
  - Richard van den Brand (ricbra)
  - develop
+ - VJ
  - ReenExe
  - Mark Sonnabaum
  - Richard Quadling
@@ -645,6 +653,7 @@ Symfony is the result of the work of many people who made the code better
  - Baldur Rensch (brensch)
  - Vladyslav Petrovych
  - Alex Xandra Albert Sim
+ - Craig Duncan (duncan3dc)
  - Carson Full
  - Trent Steel (trsteel88)
  - Yuen-Chi Lian
@@ -700,7 +709,6 @@ Symfony is the result of the work of many people who made the code better
  - Jan Prieser
  - Adrien Lucas (adrienlucas)
  - Zhuravlev Alexander (scif)
- - Yanick Witschi (toflar)
  - James Michael DuPont
  - Tom Klingenberg
  - Christopher Hall (mythmakr)
@@ -725,6 +733,7 @@ Symfony is the result of the work of many people who made the code better
  - Dmitry Parnas (parnas)
  - Paul LE CORRE
  - DQNEO
+ - Shawn Iwinski
  - Emanuele Iannone
  - Tony Malzhacker
  - Mathieu MARCHOIS
@@ -741,6 +750,7 @@ Symfony is the result of the work of many people who made the code better
  - Aleksey Podskrebyshev
  - Calin Mihai Pristavu
  - David Marín Carreño (davefx)
+ - Fabien LUCAS (flucas2)
  - Jörn Lang (j.lang)
  - Omar Yepez (oyepez003)
  - mwsaz
@@ -804,7 +814,6 @@ Symfony is the result of the work of many people who made the code better
  - stefan.r
  - Valérian Galliat
  - Rikijs Murgs
- - Alexandru Furculita (afurculita)
  - Ben Ramsey (ramsey)
  - Christian Jul Jensen
  - Alexandre GESLIN (alexandregeslin)
@@ -838,6 +847,7 @@ Symfony is the result of the work of many people who made the code better
  - Anton Babenko (antonbabenko)
  - Irmantas Šiupšinskas (irmantas)
  - Danilo Silva
+ - Arnaud PETITPAS (apetitpa)
  - Zachary Tong (polyfractal)
  - Hryhorii Hrebiniuk
  - Dennis Fridrich (dfridrich)
@@ -864,6 +874,8 @@ Symfony is the result of the work of many people who made the code better
  - Israel J. Carberry
  - Bob van de Vijver
  - Christian Neff
+ - Oliver Hoff
+ - Ole Rößner (basster)
  - Per Sandström (per)
  - Goran Juric
  - Laurent Ghirardotti (laurentg)
@@ -876,6 +888,7 @@ Symfony is the result of the work of many people who made the code better
  - Ville Mattila
  - ilyes kooli
  - gr1ev0us
+ - mlazovla
  - Boris Vujicic (boris.vujicic)
  - Max Beutel
  - Antanas Arvasevicius
@@ -895,6 +908,7 @@ Symfony is the result of the work of many people who made the code better
  - Martijn Evers
  - Benjamin Paap (benjaminpaap)
  - Christian
+ - Denis Golubovskiy (bukashk0zzz)
  - Sergii Smertin (nfx)
  - hugofonseca (fonsecas72)
  - Martynas Narbutas
@@ -956,6 +970,7 @@ Symfony is the result of the work of many people who made the code better
  - Yannick
  - spdionis
  - rchoquet
+ - gitlost
  - Taras Girnyk
  - Eduardo García Sanz (coma)
  - James Gilliland
@@ -963,10 +978,12 @@ Symfony is the result of the work of many people who made the code better
  - Rhodri Pugh (rodnaph)
  - David de Boer (ddeboer)
  - Klaus Purer
+ - arnaud (arnooo999)
  - Gilles Doge (gido)
  - abulford
  - Philipp Kretzschmar
  - antograssiot
+ - Ilya Vertakov
  - Brooks Boyd
  - Roger Webb
  - Dmitriy Simushev
@@ -1006,13 +1023,13 @@ Symfony is the result of the work of many people who made the code better
  - Jeroen van den Enden (stoefke)
  - Jelte Steijaert (jelte)
  - Quique Porta (quiqueporta)
+ - stoccc
  - Tomasz Szymczyk (karion)
  - Xavier Coureau
  - ConneXNL
  - Aharon Perkel
  - matze
  - Abdul.Mohsen B. A. A
- - Martin Auswöger
  - Benoît Burnichon
  - pthompson
  - Malaney J. Hill
@@ -1036,6 +1053,7 @@ Symfony is the result of the work of many people who made the code better
  - Marc J. Schmidt (marcjs)
  - Marco Jantke
  - Saem Ghani
+ - Clément LEFEBVRE
  - Conrad Kleinespel
  - Sebastian Utz
  - Adrien Gallou (agallou)
@@ -1053,6 +1071,7 @@ Symfony is the result of the work of many people who made the code better
  - Cédric Lahouste (rapotor)
  - Samuel Vogel (samuelvogel)
  - Berat Doğan
+ - Guillaume LECERF
  - Juanmi Rodriguez Cerón
  - Andy Raines
  - Anthony Ferrara
@@ -1084,7 +1103,6 @@ Symfony is the result of the work of many people who made the code better
  - Alberto Pirovano (geezmo)
  - Pete Mitchell (peterjmit)
  - Tom Corrigan (tomcorrigan)
- - adev
  - Luis Galeas
  - Martin Pärtel
  - Patrick Daley (padrig)
@@ -1115,12 +1133,12 @@ Symfony is the result of the work of many people who made the code better
  - Alexander Schranz
  - Rafał Muszyński (rafmus90)
  - Timothy Anido (xanido)
+ - Mara Blaga
  - Rick Prent
  - skalpa
  - Martin Eckhardt
  - Pieter Jordaan
  - Damien Tournoud
- - Craig Duncan (duncan3dc)
  - Jon Gotlin (jongotlin)
  - Michael Dowling (mtdowling)
  - Karlos Presumido (oneko)
@@ -1136,12 +1154,14 @@ Symfony is the result of the work of many people who made the code better
  - Jānis Lukss
  - rkerner
  - Alex Silcock
+ - Qingshan Luo
  - Matthew J Mucklo
  - fdgdfg (psampaz)
  - Stéphane Seng
  - Maxwell Vandervelde
  - kaywalker
  - Mike Meier
+ - Tim Jabs
  - Sebastian Ionescu
  - Thomas Ploch
  - Simon Neidhold
@@ -1170,6 +1190,7 @@ Symfony is the result of the work of many people who made the code better
  - Zdeněk Drahoš
  - Dan Harper
  - moldcraft
+ - Antoine Bellion (abellion)
  - Ramon Kleiss (akathos)
  - César Suárez (csuarez)
  - Nicolas Badey (nico-b)
@@ -1177,6 +1198,7 @@ Symfony is the result of the work of many people who made the code better
  - Johannes Goslar
  - Geoff
  - georaldc
+ - Maarten de Boer
  - Malte Wunsch
  - wusuopu
  - povilas
@@ -1255,13 +1277,13 @@ Symfony is the result of the work of many people who made the code better
  - Romain Dorgueil
  - Christopher Parotat
  - Grayson Koonce (breerly)
- - Fabien LUCAS (flucas2)
  - Indra Gunawan (indragunawan)
  - Karim Cassam Chenaï (ka)
  - Michal Kurzeja (mkurzeja)
  - Nicolas Bastien (nicolas_bastien)
  - Denis (yethee)
  - Andrew Zhilin (zhil)
+ - Oleksii Zhurbytskyi
  - Andy Stanberry
  - Luiz “Felds” Liscia
  - Thomas Rothe
@@ -1276,7 +1298,6 @@ Symfony is the result of the work of many people who made the code better
  - Koalabaerchen
  - michalmarcinkowski
  - Warwick
- - VJ
  - Chris
  - Florent Olivaud
  - JakeFr
@@ -1343,6 +1364,7 @@ Symfony is the result of the work of many people who made the code better
  - bertillon
  - Bertalan Attila
  - Yannick Bensacq (cibou)
+ - Freek Van der Herten (freekmurze)
  - Gawain Lynch (gawain)
  - Luca Genuzio (genuzio)
  - Hans Nilsson (hansnilsson)
@@ -1365,6 +1387,7 @@ Symfony is the result of the work of many people who made the code better
  - James Hudson
  - Tom Maguire
  - David Zuelke
+ - Oleg Andreyev
  - Pierre Rineau
  - adenkejawen
  - Ari Pringle (apringle)
@@ -1407,6 +1430,7 @@ Symfony is the result of the work of many people who made the code better
  - Dane Powell
  - Gerrit Drost
  - Linnaea Von Lavia
+ - Simon Mönch
  - Javan Eskander
  - Lenar Lõhmus
  - Cristian Gonzalez
@@ -1440,6 +1464,7 @@ Symfony is the result of the work of many people who made the code better
  - Ian Jenkins (jenkoian)
  - Jorge Martin (jorgemartind)
  - Joeri Verdeyen (jverdeyen)
+ - Kevin Verschaeve (keversc)
  - Kevin Herrera (kherge)
  - Luis Ramón López López (lrlopez)
  - Bart Reunes (metalarend)
@@ -1504,13 +1529,14 @@ Symfony is the result of the work of many people who made the code better
  - jc
  - BenjaminBeck
  - Aurelijus Rožėnas
+ - Vladimir Tsykun
  - znerol
  - Christian Eikermann
  - Antonio Angelino
  - Matt Fields
- - Shawn Iwinski
  - Niklas Keller
  - Vladimir Sazhin
+ - Billie Thompson
  - lol768
  - jamogon
  - Vyacheslav Slinko
@@ -1574,7 +1600,6 @@ Symfony is the result of the work of many people who made the code better
  - Matt Janssen
  - Peter Gribanov
  - Ben Johnson
- - Florent Mata
  - kwiateusz
  - David Soria Parra
  - Sergiy Sokolenko
@@ -1594,6 +1619,7 @@ Symfony is the result of the work of many people who made the code better
  - Christian Stocker
  - Dawid Nowak
  - Lesnykh Ilia
+ - darnel
  - Karolis Daužickas
  - Nicolas
  - Sergio Santoro
@@ -1636,6 +1662,7 @@ Symfony is the result of the work of many people who made the code better
  - Fabien D. (fabd)
  - Carsten Eilers (fnc)
  - Sorin Gitlan (forapathy)
+ - Forfarle (forfarle)
  - Yohan Giarelli (frequence-web)
  - Gerry Vandermaesen (gerryvdm)
  - Ghazy Ben Ahmed (ghazy)
@@ -1678,6 +1705,7 @@ Symfony is the result of the work of many people who made the code better
  - Philipp Hoffmann (philipphoffmann)
  - Alex Carol (picard89)
  - Daniel Perez Pinazo (pitiflautico)
+ - Phil Taylor (prazgod)
  - Brayden Williams (redstar504)
  - Rich Sage (richsage)
  - Bart Ruysseveldt (ruyss)
@@ -1689,6 +1717,7 @@ Symfony is the result of the work of many people who made the code better
  - Bruno Ziegler (sfcoder)
  - Andrea Giuliano (shark)
  - Schuyler Jager (sjager)
+ - Pascal Luna (skalpa)
  - Volker (skydiablo)
  - Julien Sanchez (sumbobyboys)
  - Guillermo Gisinger (t3chn0r)