Merge branch '3.4' into 4.4

* 3.4:
  Remove "branch-alias", populate "version"

Author: nicolas-grekas

composer.json

@@ -27,12 +27,10 @@
     },
     "minimum-stability": "dev",
     "extra": {
-        "branch-alias": {
-            "dev-master": "1.1-dev"
-        },
         "thanks": {
             "name": "symfony/contracts",
             "url": "https://github.com/symfony/contracts"
         }
-    }
+    },
+    "version": "1.1-dev"
 }