Merge branch '4.4' into 5.1

* 4.4:
  Fix branch-version

Author: nicolas-grekas

composer.json

@@ -32,6 +32,6 @@
         }
     },
     "extra": {
-        "branch-version": "2.1-dev"
+        "branch-version": "2.1"
     }
 }