Merging develop to master in preparation for 3.2.0 release.

Author: weierophinney

CHANGELOG.md

@@ -2,15 +2,18 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.1.1 - TBD
+## 3.2.0 - 2018-08-01
 
 ### Added
 
-- Nothing.
+- [#50](https://github.com/zendframework/zend-router/pull/50) adds `Zend\Router\Http\Placeholder`, which can be used within reusable
+  modules to indicate a route with child routes where the root route may be
+  overridden. By default, the `Placeholder` route always matches, passing on
+  further matching to the defined child routes.
 
 ### Changed
 
-- Nothing.
+- [#38](https://github.com/zendframework/zend-router/pull/38) bumps the minimum supported zend-http version to 2.8.1.
 
 ### Deprecated
 

composer.json

@@ -20,7 +20,7 @@
     "require": {
         "php": "^5.6 || ^7.0",
         "container-interop/container-interop": "^1.2",
-        "zendframework/zend-http": "^2.6",
+        "zendframework/zend-http": "^2.8.1",
         "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
         "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
     },
@@ -50,8 +50,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1.x-dev",
-            "dev-develop": "3.2.x-dev"
+            "dev-master": "3.2.x-dev",
+            "dev-develop": "3.3.x-dev"
         },
         "zf": {
             "component": "Zend\\Router",