Merge branch '2.2' into 2.3

# Conflicts:
#	src/Console/Application.php

src/Console/Application.php

@@ -28,7 +28,7 @@ use Symfony\Component\Console\Command\ListCommand;
  */
 final class Application extends BaseApplication
 {
-    const VERSION = '2.3.2';
+    const VERSION = '2.3.3-DEV';
 
     public function __construct()
     {