Merge branch '3.4' into 4.4

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

Author: nicolas-grekas

composer.json

@@ -38,12 +38,10 @@
     ],
     "minimum-stability": "dev",
     "extra": {
-        "branch-alias": {
-            "dev-master": "4.4-dev"
-        },
         "thanks": {
             "name": "phpunit/phpunit",
             "url": "https://github.com/sebastianbergmann/phpunit"
         }
-    }
+    },
+    "version": "4.4-dev"
 }