diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b58e5e9..b1d9a82a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,13 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.9.1 - TBD
+## 2.10.0 - 2018-06-07
 
 ### Added
 
+- [#213](https://github.com/zendframework/zend-mail/pull/213) re-adds support for PHP 5.6 and 7.0; ZF policy is never
+  to bump the major version of a PHP requirement unless the package is bumping major version.
+
 - [#172](https://github.com/zendframework/zend-mail/pull/172) adds the flag `connection_time_limit` to the possible `Zend\Mail\Transport\Smtp` options.
   This flag, when provided as a positive integer, and in conjunction with the `use_complete_quit` flag, will
   reconnect to the server after the specified interval.
@@ -19,9 +22,6 @@ All notable changes to this project will be documented in this file, in reverse
   The method can be used to generate an instance from a string containing a `(name)?<email>` value.
   The `$comment` argument can be used to associate a comment with the address.
 
-- [#213](https://github.com/zendframework/zend-mail/pull/213) re-adds support for PHP 5.6 and 7.0; ZF policy is never
-  to bump the major version of a PHP requirement unless the package is bumping major version.
-
 ### Changed
 
 - [#196](https://github.com/zendframework/zend-mail/pull/196) updates how the `Headers::fromString()` handles header line continuations
diff --git a/composer.json b/composer.json
index 9eecaf6b..b172cefd 100644
--- a/composer.json
+++ b/composer.json
@@ -50,8 +50,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.9.x-dev",
-            "dev-develop": "2.10.x-dev"
+            "dev-master": "2.10.x-dev",
+            "dev-develop": "2.11.x-dev"
         },
         "zf": {
             "component": "Zend\\Mail",
diff --git a/composer.lock b/composer.lock
index 878dac3e..9ecde18a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c94ce032232380dbc3d5fcbc3ed7655b",
+    "content-hash": "73da7f1606bd0c6cd257470861d2a09f",
     "packages": [
         {
             "name": "container-interop/container-interop",
diff --git a/src/Header/ListParser.php b/src/Header/ListParser.php
index 4b1f2be1..d523d011 100644
--- a/src/Header/ListParser.php
+++ b/src/Header/ListParser.php
@@ -9,6 +9,9 @@
 
 use function in_array;
 
+/**
+ * @internal
+ */
 class ListParser
 {
     const CHAR_QUOTES = ['\'', '"'];