From 38b6f491b05bcc61961fd54d8f74a37e57d4b456 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Tue, 22 Aug 2017 15:37:45 -0500
Subject: [PATCH 1/2] Updates branch-aliases

- dev-master => 1.5-dev
- dev-develop => 1.6-dev
---
 composer.json | 4 ++--
 composer.lock | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index f5edbf1f..ff9004fe 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,8 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.4-dev",
-      "dev-develop": "1.5-dev"
+      "dev-master": "1.5-dev",
+      "dev-develop": "1.6-dev"
     }
   },
   "require": {
diff --git a/composer.lock b/composer.lock
index e392f25f..1bbea2ef 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "cad2af3ecec795f3637a4b8fb753e798",
+    "content-hash": "2f6165f1b8a5fc92c354e682a1c944a2",
     "packages": [
         {
             "name": "psr/http-message",

From 55ff330aa0488085c1fd57b3313c16a0c052ef56 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Tue, 22 Aug 2017 15:38:45 -0500
Subject: [PATCH 2/2] Prepares CHANGELOG for 1.5.0 release

- Adds release date to 1.5.0 entry
- Removes empty 1.4.2 entry
---
 CHANGELOG.md | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d40d0a1e..16b15c34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.5.0 - TBD
+## 1.5.0 - 2017-08-22
 
 ### Added
 
@@ -62,28 +62,6 @@ All notable changes to this project will be documented in this file, in reverse
   `Uri` class provides user-info within the URI authority; the value is now
   correctly percent-encoded , per RFC 3986 Section 3.2.1.
 
-## 1.4.2 - TBD
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 1.4.1 - 2017-08-17
 
 ### Added