Merge branch '5.1' into 5.x

* 5.1:
  Fix branch-version

Author: nicolas-grekas

composer.json

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