diff --git a/composer.lock b/composer.lock
index e092980..e20eaab 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1980,16 +1980,16 @@
         },
         {
             "name": "wikimedia/composer-merge-plugin",
-            "version": "v1.3.0",
+            "version": "v1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wikimedia/composer-merge-plugin.git",
-                "reference": "bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9"
+                "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9",
-                "reference": "bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9",
+                "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4",
+                "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4",
                 "shasum": ""
             },
             "require": {
@@ -2025,7 +2025,7 @@
                 }
             ],
             "description": "Composer plugin to merge multiple composer.json files",
-            "time": "2015-11-06 20:31:16"
+            "time": "2016-03-08 17:11:37"
         },
         {
             "name": "zendframework/zend-diactoros",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 38b3a3d..28ad2e4 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -3686,57 +3686,6 @@
         ]
     },
     {
-        "name": "wikimedia/composer-merge-plugin",
-        "version": "v1.3.0",
-        "version_normalized": "1.3.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/wikimedia/composer-merge-plugin.git",
-            "reference": "bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9",
-            "reference": "bfed1f8d4eb97e9ba80eee57ea46229d7e5364d9",
-            "shasum": ""
-        },
-        "require": {
-            "composer-plugin-api": "^1.0",
-            "php": ">=5.3.2"
-        },
-        "require-dev": {
-            "composer/composer": "1.0.*@dev",
-            "jakub-onderka/php-parallel-lint": "~0.8",
-            "phpunit/phpunit": "~4.8|~5.0",
-            "squizlabs/php_codesniffer": "~2.1.0"
-        },
-        "time": "2015-11-06 20:31:16",
-        "type": "composer-plugin",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.3.x-dev"
-            },
-            "class": "Wikimedia\\Composer\\MergePlugin"
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Wikimedia\\Composer\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Bryan Davis",
-                "email": "bd808@wikimedia.org"
-            }
-        ],
-        "description": "Composer plugin to merge multiple composer.json files"
-    },
-    {
         "name": "jcalderonzumba/mink-phantomjs-driver",
         "version": "v0.3.1",
         "version_normalized": "0.3.1.0",
@@ -3857,5 +3806,56 @@
             "headless",
             "phantomjs"
         ]
+    },
+    {
+        "name": "wikimedia/composer-merge-plugin",
+        "version": "v1.3.1",
+        "version_normalized": "1.3.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/wikimedia/composer-merge-plugin.git",
+            "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4",
+            "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4",
+            "shasum": ""
+        },
+        "require": {
+            "composer-plugin-api": "^1.0",
+            "php": ">=5.3.2"
+        },
+        "require-dev": {
+            "composer/composer": "1.0.*@dev",
+            "jakub-onderka/php-parallel-lint": "~0.8",
+            "phpunit/phpunit": "~4.8|~5.0",
+            "squizlabs/php_codesniffer": "~2.1.0"
+        },
+        "time": "2016-03-08 17:11:37",
+        "type": "composer-plugin",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.3.x-dev"
+            },
+            "class": "Wikimedia\\Composer\\MergePlugin"
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Wikimedia\\Composer\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Bryan Davis",
+                "email": "bd808@wikimedia.org"
+            }
+        ],
+        "description": "Composer plugin to merge multiple composer.json files"
     }
 ]
diff --git a/vendor/wikimedia/composer-merge-plugin/.arcconfig b/vendor/wikimedia/composer-merge-plugin/.arcconfig
deleted file mode 100644
index 3dfae3d..0000000
--- a/vendor/wikimedia/composer-merge-plugin/.arcconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "phabricator.uri" : "https://phabricator.wikimedia.org/",
-    "repository.callsign" : "GCMP",
-    "history.immutable" : false,
-    "unit.engine": "PhpunitTestEngine"
-}
diff --git a/vendor/wikimedia/composer-merge-plugin/.arclint b/vendor/wikimedia/composer-merge-plugin/.arclint
deleted file mode 100644
index da42f29..0000000
--- a/vendor/wikimedia/composer-merge-plugin/.arclint
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "exclude": "(^vendor/)",
-    "linters": {
-        "php": {
-            "type": "php",
-            "include": "(\\.php$)"
-        },
-        "json": {
-            "type": "json",
-            "include": "(\\.json$)"
-        }
-    }
-}
diff --git a/vendor/wikimedia/composer-merge-plugin/src/Merge/ExtraPackage.php b/vendor/wikimedia/composer-merge-plugin/src/Merge/ExtraPackage.php
index ebecdff..b32131f 100644
--- a/vendor/wikimedia/composer-merge-plugin/src/Merge/ExtraPackage.php
+++ b/vendor/wikimedia/composer-merge-plugin/src/Merge/ExtraPackage.php
@@ -120,6 +120,7 @@ protected function readPackageJson($path)
     }
 
     /**
+     * @param string $json
      * @return CompletePackage
      */
     protected function loadPackage($json)
@@ -350,12 +351,14 @@ protected function mergePackageLinks($type, RootPackageInterface $root)
         $links = $this->package->{$getter}();
         if (!empty($links)) {
             $unwrapped = self::unwrapIfNeeded($root, $setter);
+            // @codeCoverageIgnoreStart
             if ($root !== $unwrapped) {
                 $this->logger->warning(
                     'This Composer version does not support ' .
                     "'{$type}' merging for aliased packages."
                 );
             }
+            // @codeCoverageIgnoreEnd
             $unwrapped->{$setter}(array_merge(
                 $root->{$getter}(),
                 $this->replaceSelfVersionDependencies($type, $links, $root)
@@ -437,9 +440,24 @@ protected function replaceSelfVersionDependencies(
         $prettyVersion = $root->getPrettyVersion();
         $vp = new VersionParser();
 
+        $method = 'get' . ucfirst($linkType['method']);
+        $packages = $root->$method();
+
         return array_map(
-            function ($link) use ($linkType, $version, $prettyVersion, $vp) {
+            function ($link) use ($linkType, $version, $prettyVersion, $vp, $packages) {
                 if ('self.version' === $link->getPrettyConstraint()) {
+                    if (isset($packages[$link->getSource()])) {
+                        /** @var Link $package */
+                        $package = $packages[$link->getSource()];
+                        return new Link(
+                            $link->getSource(),
+                            $link->getTarget(),
+                            $vp->parseConstraints($package->getConstraint()->getPrettyString()),
+                            $linkType['description'],
+                            $package->getPrettyConstraint()
+                        );
+                    }
+
                     return new Link(
                         $link->getSource(),
                         $link->getTarget(),
@@ -475,12 +493,14 @@ public static function unwrapIfNeeded(
         RootPackageInterface $root,
         $method = 'setExtra'
     ) {
+        // @codeCoverageIgnoreStart
         if ($root instanceof RootAliasPackage &&
             !method_exists($root, $method)
         ) {
             // Unwrap and return the aliased RootPackage.
             $root = $root->getAliasOf();
         }
+        // @codeCoverageIgnoreEnd
         return $root;
     }
 }