diff --git a/.travis.yml b/.travis.yml
index 99239b0..50063c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,16 +23,15 @@ env:
 
 matrix:
   include:
-    - php: 5.5
-      env:
-        - CS_CHECK=true
-        - EXECUTE_DOC_CHECK=true
     - php: 5.6
       env:
         - TEST_COVERAGE=true
         - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
         - PATH="$HOME/.local/bin:$PATH"
     - php: 7
+      env:
+        - CS_CHECK=true
+    - php: 7.1
     - php: hhvm 
   allow_failures:
     - php: hhvm
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28bba02..aa9a2e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,31 +2,22 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.1.0 - TBD
-
-### Added
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
-## 3.0.2 - TBD
+## 3.1.0 - 2016-12-19
 
 ### Added
 
 - [#26](https://github.com/zendframework/zend-eventmanager/pull/26) publishes
   the documentation to https://zendframework.github.io/zend-eventmanager/
 
+### Changes
+
+- [#17](https://github.com/zendframework/zend-eventmanager/pull/17) makes a
+  number of internal changes to how listeners are stored in order to improve
+  performance, by as much as 10% in the scenario used in the MVC layer.
+  
+  Additionally, it optimizes when the target and event arguments are injected
+  into an event, eliminating that step entirely when either is unavailable.
+
 ### Deprecated
 
 - Nothing.
diff --git a/composer.json b/composer.json
index c1926e4..d2dd557 100644
--- a/composer.json
+++ b/composer.json
@@ -13,8 +13,8 @@
     "prefer-stable": true,
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0-dev",
-            "dev-develop": "3.1-dev"
+            "dev-master": "3.1-dev",
+            "dev-develop": "3.2-dev"
         }
     },
     "autoload": {
@@ -29,10 +29,10 @@
         }
     },
     "require": {
-        "php": "^5.5 || ^7.0"
+        "php": "^5.6 || ^7.0"
     },
     "require-dev": {
-        "phpunit/PHPUnit": "~4.0",
+        "phpunit/PHPUnit": "^5.6",
         "athletic/athletic": "^0.1",
         "zendframework/zend-stdlib": "^2.7.3 || ^3.0",
         "container-interop/container-interop": "^1.1.0",