diff --git a/akka-docs/rst/intro/deployment-scenarios.rst b/akka-docs/rst/intro/deployment-scenarios.rst
index 0cfd6b8308..03a7686c35 100644
--- a/akka-docs/rst/intro/deployment-scenarios.rst
+++ b/akka-docs/rst/intro/deployment-scenarios.rst
@@ -51,9 +51,9 @@ To start the application (on a unix-based system):
 .. code-block:: none
 
    cd target/universal/
-   unzip akka-sample-main-scala-2.4-SNAPSHOT.zip
-   chmod u+x akka-sample-main-scala-2.4-SNAPSHOT/bin/akka-sample-main-scala
-   akka-sample-main-scala-2.4-SNAPSHOT/bin/akka-sample-main-scala sample.hello.Main
+   unzip akka-sample-main-scala-2.5-SNAPSHOT.zip
+   chmod u+x akka-sample-main-scala-2.5-SNAPSHOT/bin/akka-sample-main-scala
+   akka-sample-main-scala-2.5-SNAPSHOT/bin/akka-sample-main-scala sample.hello.Main
 
 Use ``Ctrl-C`` to interrupt and exit the application.
 
diff --git a/akka-kernel/src/main/dist/README b/akka-kernel/src/main/dist/README
index d1eacb7972..e5fe4bc9ba 100644
--- a/akka-kernel/src/main/dist/README
+++ b/akka-kernel/src/main/dist/README
@@ -2,7 +2,7 @@
 Akka
 ====
 
-This is the Akka 2.4-SNAPSHOT download.
+This is the Akka 2.5-SNAPSHOT download.
 
 Included are all libraries, documentation, and sources for Akka.
 
diff --git a/akka-kernel/src/main/dist/config/application.conf b/akka-kernel/src/main/dist/config/application.conf
index 513a211e3f..b615bcdf86 100644
--- a/akka-kernel/src/main/dist/config/application.conf
+++ b/akka-kernel/src/main/dist/config/application.conf
@@ -1,3 +1,3 @@
 # In this file you can override any option defined in the 'reference.conf' files.
 # Copy in all or parts of the 'reference.conf' files and modify as you please.
-# For more info about config, please visit the Akka Documentation: http://akka.io/docs/akka/2.4-SNAPSHOT/
+# For more info about config, please visit the Akka Documentation: http://akka.io/docs/akka/2.5-SNAPSHOT/
diff --git a/akka-samples/akka-sample-camel-java/build.sbt b/akka-samples/akka-sample-camel-java/build.sbt
index 55ae1152ec..234f29d7d2 100644
--- a/akka-samples/akka-sample-camel-java/build.sbt
+++ b/akka-samples/akka-sample-camel-java/build.sbt
@@ -1,11 +1,11 @@
 name := "akka-sample-camel-java"
 
-version := "2.4-SNAPSHOT"
+version := "2.5-SNAPSHOT"
 
 scalaVersion := "2.11.8"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT",
+  "com.typesafe.akka" %% "akka-camel" % "2.5-SNAPSHOT",
   "org.apache.camel" % "camel-jetty" % "2.13.4",
   "org.apache.camel" % "camel-quartz" % "2.13.4",
   "org.slf4j" % "slf4j-api" % "1.7.16",
diff --git a/akka-samples/akka-sample-camel-java/tutorial/index.html b/akka-samples/akka-sample-camel-java/tutorial/index.html
index b2a0cc569a..1d4e0d91d3 100644
--- a/akka-samples/akka-sample-camel-java/tutorial/index.html
+++ b/akka-samples/akka-sample-camel-java/tutorial/index.html
@@ -8,7 +8,7 @@
 <div>
 <p>
 This tutorial contains 3 samples of 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/camel.html" target="_blank">Akka Camel</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/camel.html" target="_blank">Akka Camel</a>.
 </p>
 
 <ul>
@@ -26,7 +26,7 @@ This tutorial contains 3 samples of
 <p>
 This example demonstrates how to implement consumer and producer actors that
 support 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/camel.html#Asynchronous_routing" target="_blank">
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/camel.html#Asynchronous_routing" target="_blank">
 Asynchronous routing</a> with their Camel endpoints. The sample
 application transforms the content of the Akka homepage, <a href="http://akka.io" target="_blank">http://akka.io</a>,
 by replacing every occurrence of *Akka* with *AKKA*.
diff --git a/akka-samples/akka-sample-camel-scala/build.sbt b/akka-samples/akka-sample-camel-scala/build.sbt
index 914ecbb98c..2dd9a86132 100644
--- a/akka-samples/akka-sample-camel-scala/build.sbt
+++ b/akka-samples/akka-sample-camel-scala/build.sbt
@@ -1,12 +1,12 @@
 name := "akka-sample-camel-scala"
 
-version := "2.4-SNAPSHOT"
+version := "2.5-SNAPSHOT"
 
 scalaVersion := "2.11.8"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT",
-  "com.typesafe.akka" %% "akka-camel" % "2.4-SNAPSHOT",
+  "com.typesafe.akka" %% "akka-actor" % "2.5-SNAPSHOT",
+  "com.typesafe.akka" %% "akka-camel" % "2.5-SNAPSHOT",
   "org.apache.camel" % "camel-jetty" % "2.13.4",
   "org.apache.camel" % "camel-quartz" % "2.13.4",
   "org.slf4j" % "slf4j-api" % "1.7.16",
diff --git a/akka-samples/akka-sample-camel-scala/tutorial/index.html b/akka-samples/akka-sample-camel-scala/tutorial/index.html
index 648ba73a48..1026f1065f 100644
--- a/akka-samples/akka-sample-camel-scala/tutorial/index.html
+++ b/akka-samples/akka-sample-camel-scala/tutorial/index.html
@@ -8,7 +8,7 @@
 <div>
 <p>
 This tutorial contains 3 samples of 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/camel.html" target="_blank">Akka Camel</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/camel.html" target="_blank">Akka Camel</a>.
 </p>
 
 <ul>
@@ -26,7 +26,7 @@ This tutorial contains 3 samples of
 <p>
 This example demonstrates how to implement consumer and producer actors that
 support 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/camel.html#Asynchronous_routing" target="_blank">
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/camel.html#Asynchronous_routing" target="_blank">
 Asynchronous routing</a> with their Camel endpoints. The sample
 application transforms the content of the Akka homepage, <a href="http://akka.io" target="_blank">http://akka.io</a>,
 by replacing every occurrence of *Akka* with *AKKA*.
diff --git a/akka-samples/akka-sample-cluster-java/build.sbt b/akka-samples/akka-sample-cluster-java/build.sbt
index 2c0acdac82..4f43a617a2 100644
--- a/akka-samples/akka-sample-cluster-java/build.sbt
+++ b/akka-samples/akka-sample-cluster-java/build.sbt
@@ -1,7 +1,7 @@
 import com.typesafe.sbt.SbtMultiJvm
 import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
 
-val akkaVersion = "2.4-SNAPSHOT"
+val akkaVersion = "2.5-SNAPSHOT"
 
 val project = Project(
     id = "akka-sample-cluster-java",
@@ -10,7 +10,7 @@ val project = Project(
   .settings(SbtMultiJvm.multiJvmSettings: _*)
   .settings(
     name := "akka-sample-cluster-java",
-    version := "2.4-SNAPSHOT",
+    version := "2.5-SNAPSHOT",
     scalaVersion := "2.11.8",
     scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
     javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation"),
diff --git a/akka-samples/akka-sample-cluster-java/tutorial/index.html b/akka-samples/akka-sample-cluster-java/tutorial/index.html
index 6af2d05293..6ea54d9c5f 100644
--- a/akka-samples/akka-sample-cluster-java/tutorial/index.html
+++ b/akka-samples/akka-sample-cluster-java/tutorial/index.html
@@ -8,7 +8,7 @@
 <div>
 <p>
 This tutorial contains 4 samples illustrating different 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/cluster-usage.html" target="_blank">Akka cluster</a> features.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/cluster-usage.html" target="_blank">Akka cluster</a> features.
 </p>
 <ul>
 <li>Subscribe to cluster membership events</li>
@@ -54,7 +54,7 @@ actor.
 
 <p>
 You can read more about the cluster concepts in the 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/cluster-usage.html" target="_blank">documentation</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/cluster-usage.html" target="_blank">documentation</a>.
 </p>
 
 <p>
@@ -143,7 +143,7 @@ that happen in the cluster.
 <p>
 In the previous sample we saw how to subscribe to cluster membership events.
 You can read more about it in the 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/cluster-usage.html#Subscribe_to_Cluster_Events" target="_blank">documentation</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/cluster-usage.html#Subscribe_to_Cluster_Events" target="_blank">documentation</a>.
 How can cluster membership events be used?
 </p>
 
@@ -233,7 +233,7 @@ interesting to run them in separate processes. Stop the application in the
 <h2>Cluster Aware Routers</h2>
 
 <p>
-All <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/routing.html" target="_blank">routers</a>
+All <a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/routing.html" target="_blank">routers</a>
 can be made aware of member nodes in the cluster, i.e. deploying new routees or looking up routees
 on nodes in the cluster.
 When a node becomes unreachable or leaves the cluster the routees of that node are
@@ -244,7 +244,7 @@ when a node becomes reachable again, after having been unreachable.
 
 <p>
 You can read more about cluster aware routers in the 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/cluster-usage.html#Cluster_Aware_Routers" target="_blank">documentation</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/cluster-usage.html#Cluster_Aware_Routers" target="_blank">documentation</a>.
 </p>
 
 <p>
@@ -346,7 +346,7 @@ and deploys workers instead of looking them up.
 
 <p>
 Open <a href="#code/src/main/java/sample/cluster/stats/StatsSampleOneMasterMain.java" class="shortcut">StatsSampleOneMasterMain.java</a>.
-To keep track of a single master we use the <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/contrib/cluster-singleton.html" target="_blank">Cluster Singleton</a>
+To keep track of a single master we use the <a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/contrib/cluster-singleton.html" target="_blank">Cluster Singleton</a>
 in the contrib module. The <code>ClusterSingletonManager</code> is started on each node.
 </p>
 
@@ -411,7 +411,7 @@ the <code>AdaptiveLoadBalancingPool</code> and <code>AdaptiveLoadBalancingGroup<
 
 <p>
 You can read more about cluster metrics in the 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/cluster-usage.html#Cluster_Metrics" target="_blank">documentation</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/cluster-usage.html#Cluster_Metrics" target="_blank">documentation</a>.
 </p>
 
 <p>
diff --git a/akka-samples/akka-sample-cluster-scala/build.sbt b/akka-samples/akka-sample-cluster-scala/build.sbt
index d186891fcf..7f92cb3d61 100644
--- a/akka-samples/akka-sample-cluster-scala/build.sbt
+++ b/akka-samples/akka-sample-cluster-scala/build.sbt
@@ -1,7 +1,7 @@
 import com.typesafe.sbt.SbtMultiJvm
 import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
 
-val akkaVersion = "2.4-SNAPSHOT"
+val akkaVersion = "2.5-SNAPSHOT"
 
 val project = Project(
     id = "akka-sample-cluster-scala",
@@ -10,7 +10,7 @@ val project = Project(
   .settings(SbtMultiJvm.multiJvmSettings: _*)
   .settings(
     name := "akka-sample-cluster-scala",
-    version := "2.4-SNAPSHOT",
+    version := "2.5-SNAPSHOT",
     scalaVersion := "2.11.8",
     scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
     javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation"),
diff --git a/akka-samples/akka-sample-cluster-scala/tutorial/index.html b/akka-samples/akka-sample-cluster-scala/tutorial/index.html
index 1628cb5970..74af9fe198 100644
--- a/akka-samples/akka-sample-cluster-scala/tutorial/index.html
+++ b/akka-samples/akka-sample-cluster-scala/tutorial/index.html
@@ -8,7 +8,7 @@
 <div>
 <p>
 This tutorial contains 4 samples illustrating different 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html" target="_blank">Akka cluster</a> features.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/cluster-usage.html" target="_blank">Akka cluster</a> features.
 </p>
 <ul>
 <li>Subscribe to cluster membership events</li>
@@ -54,7 +54,7 @@ actor.
 
 <p>
 You can read more about the cluster concepts in the 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html" target="_blank">documentation</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/cluster-usage.html" target="_blank">documentation</a>.
 </p>
 
 <p>
@@ -143,7 +143,7 @@ that happen in the cluster.
 <p>
 In the previous sample we saw how to subscribe to cluster membership events.
 You can read more about it in the 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html#Subscribe_to_Cluster_Events" target="_blank">documentation</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/cluster-usage.html#Subscribe_to_Cluster_Events" target="_blank">documentation</a>.
 How can cluster membership events be used?
 </p>
 
@@ -233,7 +233,7 @@ interesting to run them in separate processes. Stop the application in the
 <h2>Cluster Aware Routers</h2>
 
 <p>
-All <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/routing.html" target="_blank">routers</a>
+All <a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/routing.html" target="_blank">routers</a>
 can be made aware of member nodes in the cluster, i.e. deploying new routees or looking up routees
 on nodes in the cluster.
 When a node becomes unreachable or leaves the cluster the routees of that node are
@@ -244,7 +244,7 @@ when a node becomes reachable again, after having been unreachable.
 
 <p>
 You can read more about cluster aware routers in the 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html#Cluster_Aware_Routers" target="_blank">documentation</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/cluster-usage.html#Cluster_Aware_Routers" target="_blank">documentation</a>.
 </p>
 
 <p>
@@ -345,7 +345,7 @@ and deploys workers instead of looking them up.
 
 <p>
 Open <a href="#code/src/main/scala/sample/cluster/stats/StatsSampleOneMaster.scala" class="shortcut">StatsSampleOneMaster.scala</a>.
-To keep track of a single master we use the <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/contrib/cluster-singleton.html" target="_blank">Cluster Singleton</a>
+To keep track of a single master we use the <a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/contrib/cluster-singleton.html" target="_blank">Cluster Singleton</a>
 in the contrib module. The <code>ClusterSingletonManager</code> is started on each node.
 </p>
 
@@ -410,7 +410,7 @@ the <code>AdaptiveLoadBalancingPool</code> and <code>AdaptiveLoadBalancingGroup<
 
 <p>
 You can read more about cluster metrics in the 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html#Cluster_Metrics" target="_blank">documentation</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/cluster-usage.html#Cluster_Metrics" target="_blank">documentation</a>.
 </p>
 
 <p>
diff --git a/akka-samples/akka-sample-distributed-data-java/build.sbt b/akka-samples/akka-sample-distributed-data-java/build.sbt
index 3654deb7fd..a716164e6b 100644
--- a/akka-samples/akka-sample-distributed-data-java/build.sbt
+++ b/akka-samples/akka-sample-distributed-data-java/build.sbt
@@ -1,7 +1,7 @@
 import com.typesafe.sbt.SbtMultiJvm
 import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
 
-val akkaVersion = "2.4-SNAPSHOT"
+val akkaVersion = "2.5-SNAPSHOT"
 
 val project = Project(
     id = "akka-sample-distributed-data-java",
@@ -10,7 +10,7 @@ val project = Project(
   .settings(SbtMultiJvm.multiJvmSettings: _*)
   .settings(
     name := "akka-sample-distributed-data-java",
-    version := "2.4-SNAPSHOT",
+    version := "2.5-SNAPSHOT",
     scalaVersion := "2.11.8",
     scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
     javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation", "-Xdiags:verbose"),
diff --git a/akka-samples/akka-sample-distributed-data-java/tutorial/index.html b/akka-samples/akka-sample-distributed-data-java/tutorial/index.html
index d2e9da6d7a..7b18760709 100644
--- a/akka-samples/akka-sample-distributed-data-java/tutorial/index.html
+++ b/akka-samples/akka-sample-distributed-data-java/tutorial/index.html
@@ -8,7 +8,7 @@
 <div>
 <p>
 This tutorial contains 5 samples illustrating how to use  
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html" target="_blank">Akka Distributed Data</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/distributed-data.html" target="_blank">Akka Distributed Data</a>.
 </p>
 <ul>
 <li>Low Latency Voting Service</li>
@@ -47,7 +47,7 @@ out-of-date value.
 
 <p>
 Note that there are some 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html#Limitations" target="_blank">Limitations</a>
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/distributed-data.html#Limitations" target="_blank">Limitations</a>
 that you should be aware of. For example, Akka Distributed Data is not intended for <i>Big Data</i>.
 </p>
 
@@ -71,7 +71,7 @@ Open <a href="#code/src/main/java/sample/distributeddata/VotingService.java" cla
 of the grand total number of votes. The actor is started on each cluster node. First it expects an 
 <code>OPEN</code> message on one or several nodes. After that the counting can begin. The open
 signal is immediately replicated to all nodes with a boolean
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html#Flags_and_Registers" target="_blank">Flag</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/distributed-data.html#Flags_and_Registers" target="_blank">Flag</a>.
 Note <code>writeAll</code>.  
 </p>
 
@@ -94,7 +94,7 @@ replicator.tell(new Subscribe&lt;&gt;(openedKey, self()), ActorRef.noSender());
 
 <p>
 The counters are kept in a 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html#Counters" target="_blank">PNCounterMap</a>
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/distributed-data.html#Counters" target="_blank">PNCounterMap</a>
 and updated with:
 </p>
 
@@ -139,7 +139,7 @@ The multi-node test for the <code>VotingService</code> can be found in
 
 <p>
 Read the 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html#Using_the_Replicator" target="_blank">Using the Replicator</a>
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/distributed-data.html#Using_the_Replicator" target="_blank">Using the Replicator</a>
 documentation for more details of how to use <code>Get</code>, <code>Update</code>, and <code>Subscribe</code>.
 </p>
 
@@ -165,7 +165,7 @@ instances may be started on different nodes and used at the same time.
 
 <p>
 Each product in the cart is represented by a <code>LineItem</code> and all items in the cart
-is collected in a <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html#Maps" target="_blank">LWWMap</a>.
+is collected in a <a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/distributed-data.html#Maps" target="_blank">LWWMap</a>.
 </p>
 
 <p>
@@ -187,7 +187,7 @@ The multi-node test for the <code>ShoppingCart</code> can be found in
 
 <p>
 Read the 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html#Consistency" target="_blank">Consistency</a>
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/distributed-data.html#Consistency" target="_blank">Consistency</a>
 section in the documentation to understand the consistency considerations.
 </p>
 
@@ -218,7 +218,7 @@ It supports two basic commands:
 
 <p>
 For each named service it is using an
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/distributed-data.html#Sets" target="_blank">ORSet</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/distributed-data.html#Sets" target="_blank">ORSet</a>.
 Here we are using top level <code>ORSet</code> entries. An alternative would have been to use a 
 <code>ORMultiMap</code> holding all services. That would have a disadvantage if we have many services.
 When a data entry is changed the full state of that entry is replicated to other nodes, i.e. when you 
diff --git a/akka-samples/akka-sample-distributed-data-scala/build.sbt b/akka-samples/akka-sample-distributed-data-scala/build.sbt
index 459a285d25..32cc9bc4e5 100644
--- a/akka-samples/akka-sample-distributed-data-scala/build.sbt
+++ b/akka-samples/akka-sample-distributed-data-scala/build.sbt
@@ -1,7 +1,7 @@
 import com.typesafe.sbt.SbtMultiJvm
 import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
 
-val akkaVersion = "2.4-SNAPSHOT"
+val akkaVersion = "2.5-SNAPSHOT"
 
 val project = Project(
     id = "akka-sample-distributed-data-scala",
@@ -10,7 +10,7 @@ val project = Project(
   .settings(SbtMultiJvm.multiJvmSettings: _*)
   .settings(
     name := "akka-sample-distributed-data-scala",
-    version := "2.4-SNAPSHOT",
+    version := "2.5-SNAPSHOT",
     scalaVersion := "2.11.8",
     scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.8", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Xlint"),
     javacOptions in Compile ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked", "-Xlint:deprecation"),
diff --git a/akka-samples/akka-sample-distributed-data-scala/tutorial/index.html b/akka-samples/akka-sample-distributed-data-scala/tutorial/index.html
index b0e7690d24..1fb6df6200 100644
--- a/akka-samples/akka-sample-distributed-data-scala/tutorial/index.html
+++ b/akka-samples/akka-sample-distributed-data-scala/tutorial/index.html
@@ -8,7 +8,7 @@
 <div>
 <p>
 This tutorial contains 5 samples illustrating how to use  
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/distributed-data.html" target="_blank">Akka Distributed Data</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/distributed-data.html" target="_blank">Akka Distributed Data</a>.
 </p>
 <ul>
 <li>Low Latency Voting Service</li>
@@ -47,7 +47,7 @@ out-of-date value.
 
 <p>
 Note that there are some 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/distributed-data.html#Limitations" target="_blank">Limitations</a>
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/distributed-data.html#Limitations" target="_blank">Limitations</a>
 that you should be aware of. For example, Akka Distributed Data is not intended for <i>Big Data</i>.
 </p>
 
@@ -71,7 +71,7 @@ Open <a href="#code/src/main/scala/sample/distributeddata/VotingService.scala" c
 of the grand total number of votes. The actor is started on each cluster node. First it expects an 
 <code>Open</code> message on one or several nodes. After that the counting can begin. The open
 signal is immediately replicated to all nodes with a boolean
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/distributed-data.html#Flags_and_Registers" target="_blank">Flag</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/distributed-data.html#Flags_and_Registers" target="_blank">Flag</a>.
 Note <code>WriteAll</code>.  
 </p>
 
@@ -94,7 +94,7 @@ case c @ Changed(OpenedKey) if c.get(OpenedKey).enabled
 
 <p>
 The counters are kept in a 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/distributed-data.html#Counters" target="_blank">PNCounterMap</a>
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/distributed-data.html#Counters" target="_blank">PNCounterMap</a>
 and updated with:
 </p>
 
@@ -131,7 +131,7 @@ The multi-node test for the <code>VotingService</code> can be found in
 
 <p>
 Read the 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/distributed-data.html#Using_the_Replicator" target="_blank">Using the Replicator</a>
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/distributed-data.html#Using_the_Replicator" target="_blank">Using the Replicator</a>
 documentation for more details of how to use <code>Get</code>, <code>Update</code>, and <code>Subscribe</code>.
 </p>
 
@@ -157,7 +157,7 @@ instances may be started on different nodes and used at the same time.
 
 <p>
 Each product in the cart is represented by a <code>LineItem</code> and all items in the cart
-is collected in a <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/distributed-data.html#Maps" target="_blank">LWWMap</a>.
+is collected in a <a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/distributed-data.html#Maps" target="_blank">LWWMap</a>.
 </p>
 
 <p>
@@ -179,7 +179,7 @@ The multi-node test for the <code>ShoppingCart</code> can be found in
 
 <p>
 Read the 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/distributed-data.html#Consistency" target="_blank">Consistency</a>
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/distributed-data.html#Consistency" target="_blank">Consistency</a>
 section in the documentation to understand the consistency considerations.
 </p>
 
@@ -210,7 +210,7 @@ It supports two basic commands:
 
 <p>
 For each named service it is using an
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/distributed-data.html#Sets" target="_blank">ORSet</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/distributed-data.html#Sets" target="_blank">ORSet</a>.
 Here we are using top level <code>ORSet</code> entries. An alternative would have been to use a 
 <code>ORMultiMap</code> holding all services. That would have a disadvantage if we have many services.
 When a data entry is changed the full state of that entry is replicated to other nodes, i.e. when you 
diff --git a/akka-samples/akka-sample-fsm-java-lambda/build.sbt b/akka-samples/akka-sample-fsm-java-lambda/build.sbt
index ff5cf7a58c..607c52f5e5 100644
--- a/akka-samples/akka-sample-fsm-java-lambda/build.sbt
+++ b/akka-samples/akka-sample-fsm-java-lambda/build.sbt
@@ -1,6 +1,6 @@
 name := "akka-sample-fsm-java-lambda"
 
-version := "2.4-SNAPSHOT"
+version := "2.5-SNAPSHOT"
 
 scalaVersion := "2.11.8"
 
@@ -11,8 +11,8 @@ javacOptions in doc ++= Seq("-encoding", "UTF-8", "-source", "1.8")
 testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a")
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %%      "akka-actor" % "2.4-SNAPSHOT",
-  "com.typesafe.akka" %%    "akka-testkit" % "2.4-SNAPSHOT" % "test",
+  "com.typesafe.akka" %%      "akka-actor" % "2.5-SNAPSHOT",
+  "com.typesafe.akka" %%    "akka-testkit" % "2.5-SNAPSHOT" % "test",
               "junit"  %           "junit" % "4.11"         % "test",
        "com.novocode"  % "junit-interface" % "0.10"         % "test")
 
diff --git a/akka-samples/akka-sample-fsm-java-lambda/pom.xml b/akka-samples/akka-sample-fsm-java-lambda/pom.xml
index 9284c5c36e..e18c9278dd 100644
--- a/akka-samples/akka-sample-fsm-java-lambda/pom.xml
+++ b/akka-samples/akka-sample-fsm-java-lambda/pom.xml
@@ -11,18 +11,18 @@
   <groupId>sample</groupId>
   <artifactId>akka-sample-fsm-java-lambda</artifactId>
   <packaging>jar</packaging>
-  <version>2.4-SNAPSHOT</version>
+  <version>2.5-SNAPSHOT</version>
 
   <dependencies>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-actor_2.11</artifactId>
-      <version>2.4-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-testkit_2.11</artifactId>
-      <version>2.4-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/akka-samples/akka-sample-fsm-java-lambda/tutorial/index.html b/akka-samples/akka-sample-fsm-java-lambda/tutorial/index.html
index 351a6cbb40..f52005cb18 100644
--- a/akka-samples/akka-sample-fsm-java-lambda/tutorial/index.html
+++ b/akka-samples/akka-sample-fsm-java-lambda/tutorial/index.html
@@ -40,7 +40,7 @@ In the log output you can see the actions of the <code>Hakker</code> actors.
 
 <p>
 Read more about <code>become</code> in
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/lambda-actors.html#Become_Unbecome" target="_blank">the documentation</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/lambda-actors.html#Become_Unbecome" target="_blank">the documentation</a>.
 </p>
 
 </div>
@@ -64,7 +64,7 @@ In the log output you can see the actions of the <code>Hakker</code> actors.
 
 <p>
 Read more about <code>akka.actor.FSM</code> in
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/lambda-fsm.html" target="_blank">the documentation</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/lambda-fsm.html" target="_blank">the documentation</a>.
 </p>
 
 </div>
diff --git a/akka-samples/akka-sample-fsm-scala/build.sbt b/akka-samples/akka-sample-fsm-scala/build.sbt
index bb7a8cd39e..e256544d91 100644
--- a/akka-samples/akka-sample-fsm-scala/build.sbt
+++ b/akka-samples/akka-sample-fsm-scala/build.sbt
@@ -1,11 +1,11 @@
 name := "akka-sample-fsm-scala"
 
-version := "2.4-SNAPSHOT"
+version := "2.5-SNAPSHOT"
 
 scalaVersion := "2.11.8"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"
+  "com.typesafe.akka" %% "akka-actor" % "2.5-SNAPSHOT"
 )
 
 licenses := Seq(("CC0", url("http://creativecommons.org/publicdomain/zero/1.0")))
diff --git a/akka-samples/akka-sample-fsm-scala/tutorial/index.html b/akka-samples/akka-sample-fsm-scala/tutorial/index.html
index f93319b8ad..6ad8955fc2 100644
--- a/akka-samples/akka-sample-fsm-scala/tutorial/index.html
+++ b/akka-samples/akka-sample-fsm-scala/tutorial/index.html
@@ -41,7 +41,7 @@ In the log output you can see the actions of the <code>Hakker</code> actors.
 
 <p>
 Read more about <code>become</code> in
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/actors.html#Become_Unbecome" target="_blank">the documentation</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/actors.html#Become_Unbecome" target="_blank">the documentation</a>.
 </p>
 
 </div>
@@ -65,7 +65,7 @@ In the log output you can see the actions of the <code>Hakker</code> actors.
 
 <p>
 Read more about <code>akka.actor.FSM</code> in
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/fsm.html" target="_blank">the documentation</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/fsm.html" target="_blank">the documentation</a>.
 </p>
 
 </div>
diff --git a/akka-samples/akka-sample-main-java-lambda/build.sbt b/akka-samples/akka-sample-main-java-lambda/build.sbt
index 114e951a17..45e61a20d5 100644
--- a/akka-samples/akka-sample-main-java-lambda/build.sbt
+++ b/akka-samples/akka-sample-main-java-lambda/build.sbt
@@ -1,11 +1,11 @@
 name := "akka-sample-main-java-lambda"
 
-version := "2.4-SNAPSHOT"
+version := "2.5-SNAPSHOT"
 
 scalaVersion := "2.11.8"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"
+  "com.typesafe.akka" %% "akka-actor" % "2.5-SNAPSHOT"
 )
 
 licenses := Seq(("CC0", url("http://creativecommons.org/publicdomain/zero/1.0")))
diff --git a/akka-samples/akka-sample-main-java-lambda/pom.xml b/akka-samples/akka-sample-main-java-lambda/pom.xml
index 8a84daaa01..5c817f16fb 100644
--- a/akka-samples/akka-sample-main-java-lambda/pom.xml
+++ b/akka-samples/akka-sample-main-java-lambda/pom.xml
@@ -7,7 +7,7 @@
   <artifactId>akka-sample-main-java-lambda</artifactId>
   <groupId>com.typesafe.akka.samples</groupId>
   <name>Akka Main in Java</name>
-  <version>2.4-SNAPSHOT</version>
+  <version>2.5-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-actor_2.11</artifactId>
-      <version>2.4-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/akka-samples/akka-sample-main-java-lambda/tutorial/index.html b/akka-samples/akka-sample-main-java-lambda/tutorial/index.html
index a22d8acb12..809eb33606 100644
--- a/akka-samples/akka-sample-main-java-lambda/tutorial/index.html
+++ b/akka-samples/akka-sample-main-java-lambda/tutorial/index.html
@@ -76,7 +76,7 @@ This conveniently assumes placement of the above class definitions in package
 <code>sample.hello</code> and it further assumes that you have the required JAR files for
 <code>scala-library</code>, <code>typesafe-config</code> and <code>akka-actor</code> available.
 The easiest would be to manage these dependencies with a
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/intro/getting-started.html#Using_a_build_tool" target="_blank">build tool</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/intro/getting-started.html#Using_a_build_tool" target="_blank">build tool</a>.
 </p>
 
 <p>
diff --git a/akka-samples/akka-sample-main-java/build.sbt b/akka-samples/akka-sample-main-java/build.sbt
index 5dc58fb852..d451232985 100644
--- a/akka-samples/akka-sample-main-java/build.sbt
+++ b/akka-samples/akka-sample-main-java/build.sbt
@@ -1,11 +1,11 @@
 name := "akka-sample-main-java"
 
-version := "2.4-SNAPSHOT"
+version := "2.5-SNAPSHOT"
 
 scalaVersion := "2.11.8"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"
+  "com.typesafe.akka" %% "akka-actor" % "2.5-SNAPSHOT"
 )
 
 licenses := Seq(("CC0", url("http://creativecommons.org/publicdomain/zero/1.0")))
diff --git a/akka-samples/akka-sample-main-java/pom.xml b/akka-samples/akka-sample-main-java/pom.xml
index 8989612185..0f83da61bf 100644
--- a/akka-samples/akka-sample-main-java/pom.xml
+++ b/akka-samples/akka-sample-main-java/pom.xml
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-actor_2.11</artifactId>
-      <version>2.4-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/akka-samples/akka-sample-main-java/tutorial/index.html b/akka-samples/akka-sample-main-java/tutorial/index.html
index 69d24617e1..66b99d1a97 100644
--- a/akka-samples/akka-sample-main-java/tutorial/index.html
+++ b/akka-samples/akka-sample-main-java/tutorial/index.html
@@ -76,7 +76,7 @@ This conveniently assumes placement of the above class definitions in package
 <code>sample.hello</code> and it further assumes that you have the required JAR files for
 <code>scala-library</code>, <code>typesafe-config</code> and <code>akka-actor</code> available.
 The easiest would be to manage these dependencies with a 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/intro/getting-started.html#Using_a_build_tool" target="_blank">build tool</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/intro/getting-started.html#Using_a_build_tool" target="_blank">build tool</a>.
 </p>
 
 <p>
diff --git a/akka-samples/akka-sample-main-scala/build.sbt b/akka-samples/akka-sample-main-scala/build.sbt
index 5ca00aea90..a2991dc290 100644
--- a/akka-samples/akka-sample-main-scala/build.sbt
+++ b/akka-samples/akka-sample-main-scala/build.sbt
@@ -2,12 +2,12 @@ import NativePackagerHelper._
 
 name := "akka-sample-main-scala"
 
-version := "2.4-SNAPSHOT"
+version := "2.5-SNAPSHOT"
 
 scalaVersion := "2.11.8"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT"
+  "com.typesafe.akka" %% "akka-actor" % "2.5-SNAPSHOT"
 )
 
 enablePlugins(JavaServerAppPackaging)
diff --git a/akka-samples/akka-sample-main-scala/tutorial/index.html b/akka-samples/akka-sample-main-scala/tutorial/index.html
index c87f15a9ff..404ee3754a 100644
--- a/akka-samples/akka-sample-main-scala/tutorial/index.html
+++ b/akka-samples/akka-sample-main-scala/tutorial/index.html
@@ -76,7 +76,7 @@ This conveniently assumes placement of the above class definitions in package
 <code>sample.hello</code> and it further assumes that you have the required JAR files for
 <code>scala-library</code>, <code>typesafe-config</code> and <code>akka-actor</code> available.
 The easiest would be to manage these dependencies with a 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/intro/getting-started.html#Using_a_build_tool" target="_blank">build tool</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/intro/getting-started.html#Using_a_build_tool" target="_blank">build tool</a>.
 </p>
 
 <p>
diff --git a/akka-samples/akka-sample-multi-node-scala/build.sbt b/akka-samples/akka-sample-multi-node-scala/build.sbt
index cad5836471..08fef52eaa 100644
--- a/akka-samples/akka-sample-multi-node-scala/build.sbt
+++ b/akka-samples/akka-sample-multi-node-scala/build.sbt
@@ -1,7 +1,7 @@
 import com.typesafe.sbt.SbtMultiJvm
 import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
 
-val akkaVersion = "2.4-SNAPSHOT"
+val akkaVersion = "2.5-SNAPSHOT"
 
 val project = Project(
     id = "akka-sample-multi-node-scala",
@@ -10,7 +10,7 @@ val project = Project(
   .settings(SbtMultiJvm.multiJvmSettings: _*)
   .settings(
     name := "akka-sample-multi-node-scala",
-    version := "2.4-SNAPSHOT",
+    version := "2.5-SNAPSHOT",
     scalaVersion := "2.11.8",
     libraryDependencies ++= Seq(
       "com.typesafe.akka" %% "akka-actor" % akkaVersion,
diff --git a/akka-samples/akka-sample-multi-node-scala/tutorial/index.html b/akka-samples/akka-sample-multi-node-scala/tutorial/index.html
index 2240387e64..0de31ddf95 100644
--- a/akka-samples/akka-sample-multi-node-scala/tutorial/index.html
+++ b/akka-samples/akka-sample-multi-node-scala/tutorial/index.html
@@ -13,12 +13,12 @@ and test classes for illustrating multi-node testing with Akka.
 
 <p>
 Please refer to the full documentation of 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/dev/multi-node-testing.html" target="_blank">multi-node testing</a>
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/dev/multi-node-testing.html" target="_blank">multi-node testing</a>
 and the closely related
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/dev/multi-jvm-testing.html" target="_blank">multi-jvm testing</a>
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/dev/multi-jvm-testing.html" target="_blank">multi-jvm testing</a>
 for details.
 There is also an section on 
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/cluster-usage.html#How_to_Test" target="_blank">cluster testing</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/cluster-usage.html#How_to_Test" target="_blank">cluster testing</a>.
 </p>
 
 </div>
@@ -79,7 +79,7 @@ the sbt prompt:
 
 <p>
 The same test can be run on multiple machines as described in the
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/dev/multi-node-testing.html" target="_blank">multi-node testing documentation</a>.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/dev/multi-node-testing.html" target="_blank">multi-node testing documentation</a>.
 </p> 
 
 
diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/api/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/api/pom.xml
index e2d652cb84..73c89d95c5 100644
--- a/akka-samples/akka-sample-osgi-dining-hakkers/api/pom.xml
+++ b/akka-samples/akka-sample-osgi-dining-hakkers/api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
         <artifactId>project</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/assembly-dist/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/assembly-dist/pom.xml
index 469de29267..8e6cf6cbec 100644
--- a/akka-samples/akka-sample-osgi-dining-hakkers/assembly-dist/pom.xml
+++ b/akka-samples/akka-sample-osgi-dining-hakkers/assembly-dist/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
         <artifactId>project</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>akka-sample-osgi-dining-hakkers-dist</artifactId>
diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/assembly-features/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/assembly-features/pom.xml
index 6bb3f0b330..5dc99beac5 100644
--- a/akka-samples/akka-sample-osgi-dining-hakkers/assembly-features/pom.xml
+++ b/akka-samples/akka-sample-osgi-dining-hakkers/assembly-features/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
         <artifactId>project</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>akka-sample-osgi-dining-hakkers</artifactId>
diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/command/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/command/pom.xml
index 74ef462e2a..5ab4186172 100644
--- a/akka-samples/akka-sample-osgi-dining-hakkers/command/pom.xml
+++ b/akka-samples/akka-sample-osgi-dining-hakkers/command/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
         <artifactId>project</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/core/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/core/pom.xml
index 4087122b8c..7b0d3232a4 100644
--- a/akka-samples/akka-sample-osgi-dining-hakkers/core/pom.xml
+++ b/akka-samples/akka-sample-osgi-dining-hakkers/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
         <artifactId>project</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/integration-test/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/integration-test/pom.xml
index 2a51852dee..e25b2ea06b 100644
--- a/akka-samples/akka-sample-osgi-dining-hakkers/integration-test/pom.xml
+++ b/akka-samples/akka-sample-osgi-dining-hakkers/integration-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
         <artifactId>project</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/karaf.sh b/akka-samples/akka-sample-osgi-dining-hakkers/karaf.sh
index 4c9d8d40b3..8396458595 100755
--- a/akka-samples/akka-sample-osgi-dining-hakkers/karaf.sh
+++ b/akka-samples/akka-sample-osgi-dining-hakkers/karaf.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 projdir=$(cd $(dirname $0); pwd)
-version=2.4-SNAPSHOT
+version=2.5-SNAPSHOT
 
 # This directory is specified in the build as the root of the tar
 # Use tar --strip-components=1 to ignore the root
diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml
index 1e23c40c73..33fc68357a 100644
--- a/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml
+++ b/akka-samples/akka-sample-osgi-dining-hakkers/pom.xml
@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
     <artifactId>project</artifactId>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <akka.version>2.4-SNAPSHOT</akka.version>
+        <akka.version>2.5-SNAPSHOT</akka.version>
         <!-- Support for eecap-1.8 (Java 8) is from 3.0.2 -->
         <!-- https://github.com/apache/karaf/blob/karaf-3.0.2/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties -->
         <karaf.version>3.0.8</karaf.version>
diff --git a/akka-samples/akka-sample-osgi-dining-hakkers/uncommons/pom.xml b/akka-samples/akka-sample-osgi-dining-hakkers/uncommons/pom.xml
index 3d55bcd809..126da1c2ba 100644
--- a/akka-samples/akka-sample-osgi-dining-hakkers/uncommons/pom.xml
+++ b/akka-samples/akka-sample-osgi-dining-hakkers/uncommons/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.typesafe.akka.akka-sample-osgi-dining-hakkers</groupId>
         <artifactId>project</artifactId>
-        <version>2.4-SNAPSHOT</version>
+        <version>2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/akka-samples/akka-sample-persistence-java-lambda/build.sbt b/akka-samples/akka-sample-persistence-java-lambda/build.sbt
index 6d853f83c8..c1a47907a0 100644
--- a/akka-samples/akka-sample-persistence-java-lambda/build.sbt
+++ b/akka-samples/akka-sample-persistence-java-lambda/build.sbt
@@ -1,6 +1,6 @@
 name := "akka-sample-persistence-java-lambda"
 
-version := "2.4-SNAPSHOT"
+version := "2.5-SNAPSHOT"
 
 scalaVersion := "2.11.8"
 
@@ -9,7 +9,7 @@ javacOptions in compile ++= Seq("-encoding", "UTF-8", "-source", "1.8", "-target
 javacOptions in doc ++= Seq("-encoding", "UTF-8", "-source", "1.8", "-Xdoclint:none")
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-persistence" % "2.4-SNAPSHOT",
+  "com.typesafe.akka" %% "akka-persistence" % "2.5-SNAPSHOT",
   "org.iq80.leveldb" % "leveldb" % "0.7",
   "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.8"
 )
diff --git a/akka-samples/akka-sample-persistence-java-lambda/pom.xml b/akka-samples/akka-sample-persistence-java-lambda/pom.xml
index 7fc5ccee63..28890ebeb3 100644
--- a/akka-samples/akka-sample-persistence-java-lambda/pom.xml
+++ b/akka-samples/akka-sample-persistence-java-lambda/pom.xml
@@ -11,23 +11,23 @@
     <groupId>sample</groupId>
     <artifactId>akka-sample-persistence-java8</artifactId>
     <packaging>jar</packaging>
-    <version>2.4-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-actor_2.11</artifactId>
-            <version>2.4-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-persistence_2.11</artifactId>
-            <version>2.4-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-testkit_2.11</artifactId>
-            <version>2.4-SNAPSHOT</version>
+            <version>2.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/akka-samples/akka-sample-persistence-java-lambda/tutorial/index.html b/akka-samples/akka-sample-persistence-java-lambda/tutorial/index.html
index 790be4a926..54d9b9389e 100644
--- a/akka-samples/akka-sample-persistence-java-lambda/tutorial/index.html
+++ b/akka-samples/akka-sample-persistence-java-lambda/tutorial/index.html
@@ -9,7 +9,7 @@
 <h2>Akka Persistence Samples</h2>
 <p>
 This tutorial contains examples that illustrate a subset of
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/lambda-persistence.html" target="_blank">Akka Persistence</a> features.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/lambda-persistence.html" target="_blank">Akka Persistence</a> features.
 </p>
 <ul>
 <li>persistent actor</li>
@@ -28,7 +28,7 @@ Custom storage locations for the journal and snapshots can be defined in
 <h2>Persistent actor</h2>
 <p>
 <a href="#code/src/main/java/sample/persistence/PersistentActorExample.java" class="shortcut">PersistentActorExample.java</a>
-is described in detail in the <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/lambda-persistence.html#event-sourcing-java-lambda" target="_blank">Event sourcing</a>
+is described in detail in the <a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/lambda-persistence.html#event-sourcing-java-lambda" target="_blank">Event sourcing</a>
 section of the user documentation. With every application run, the <code>ExamplePersistentActor</code> is recovered from
 events stored in previous application runs, processes new commands, stores new events and snapshots and prints the
 current persistent actor state to <code>stdout</code>.
diff --git a/akka-samples/akka-sample-persistence-java/build.sbt b/akka-samples/akka-sample-persistence-java/build.sbt
index 8496e0648e..3e05bd753b 100644
--- a/akka-samples/akka-sample-persistence-java/build.sbt
+++ b/akka-samples/akka-sample-persistence-java/build.sbt
@@ -1,11 +1,11 @@
 name := "akka-sample-persistence-java"
 
-version := "2.4-SNAPSHOT"
+version := "2.5-SNAPSHOT"
 
 scalaVersion := "2.11.8"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-persistence" % "2.4-SNAPSHOT",
+  "com.typesafe.akka" %% "akka-persistence" % "2.5-SNAPSHOT",
   "org.iq80.leveldb" % "leveldb" % "0.7",
   "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.8"
 )
diff --git a/akka-samples/akka-sample-persistence-java/tutorial/index.html b/akka-samples/akka-sample-persistence-java/tutorial/index.html
index c24b1e21ac..2fa99ad9d7 100644
--- a/akka-samples/akka-sample-persistence-java/tutorial/index.html
+++ b/akka-samples/akka-sample-persistence-java/tutorial/index.html
@@ -9,7 +9,7 @@
 <h2>Akka Persistence Samples</h2>
 <p>
 This tutorial contains examples that illustrate a subset of
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/persistence.html" target="_blank">Akka Persistence</a> features.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/persistence.html" target="_blank">Akka Persistence</a> features.
 </p>
 <ul>
 <li>persistent actor</li>
@@ -28,7 +28,7 @@ Custom storage locations for the journal and snapshots can be defined in
 <h2>Persistent actor</h2>
 <p>
 <a href="#code/src/main/java/sample/persistence/PersistentActorExample.java" class="shortcut">PersistentActorExample.java</a>
-is described in detail in the <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/persistence.html#event-sourcing-java" target="_blank">Event sourcing</a>
+is described in detail in the <a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/persistence.html#event-sourcing-java" target="_blank">Event sourcing</a>
 section of the user documentation. With every application run, the <code>ExamplePersistentActor</code> is recovered from
 events stored in previous application runs, processes new commands, stores new events and snapshots and prints the
 current persistent actor state to <code>stdout</code>.
@@ -78,7 +78,7 @@ in the case where you persist a command that corrupts your state. The corrupt co
 to delete the corrupt commands from the journal.
 </p>
 <p>
-In an <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/persistence.html#event-sourcing" target="_blank">event sourced</a>
+In an <a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/persistence.html#event-sourcing" target="_blank">event sourced</a>
 system, one does not persist commands directly but rather events that have been derived from received commands
 (not shown here). These events are known to be successfully applicable to current processor state i.e. there's
 no need for deleting them from the journal. Event sourced processors usually have a lower throughput than command
diff --git a/akka-samples/akka-sample-persistence-scala/build.sbt b/akka-samples/akka-sample-persistence-scala/build.sbt
index 2cf1264817..8330b0cd40 100644
--- a/akka-samples/akka-sample-persistence-scala/build.sbt
+++ b/akka-samples/akka-sample-persistence-scala/build.sbt
@@ -1,12 +1,12 @@
 name := "akka-sample-persistence-scala"
 
-version := "2.4-SNAPSHOT"
+version := "2.5-SNAPSHOT"
 
 scalaVersion := "2.11.8"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT",
-  "com.typesafe.akka" %% "akka-persistence" % "2.4-SNAPSHOT",
+  "com.typesafe.akka" %% "akka-actor" % "2.5-SNAPSHOT",
+  "com.typesafe.akka" %% "akka-persistence" % "2.5-SNAPSHOT",
   "org.iq80.leveldb"            % "leveldb"          % "0.7",
   "org.fusesource.leveldbjni"   % "leveldbjni-all"   % "1.8"
 )
diff --git a/akka-samples/akka-sample-persistence-scala/tutorial/index.html b/akka-samples/akka-sample-persistence-scala/tutorial/index.html
index 338fd59b8b..5e0ac1829a 100644
--- a/akka-samples/akka-sample-persistence-scala/tutorial/index.html
+++ b/akka-samples/akka-sample-persistence-scala/tutorial/index.html
@@ -8,7 +8,7 @@
 <div>
 <p>
 This tutorial contains examples that illustrate a subset of
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/persistence.html" target="_blank">Akka Persistence</a> features.
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/persistence.html" target="_blank">Akka Persistence</a> features.
 </p>
 <ul>
 <li>persistent actor</li>
@@ -27,7 +27,7 @@ Custom storage locations for the journal and snapshots can be defined in
 <h2>Persistent actor</h2>
 <p>
 <a href="#code/src/main/scala/sample/persistence/PersistentActorExample.scala" class="shortcut">PersistentActorExample.scala</a>
-is described in detail in the <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/persistence.html#event-sourcing" target="_blank">Event sourcing</a>
+is described in detail in the <a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/persistence.html#event-sourcing" target="_blank">Event sourcing</a>
 section of the user documentation. With every application run, the <code>ExamplePersistentActor</code> is recovered from
 events stored in previous application runs, processes new commands, stores new events and snapshots and prints the
 current persistent actor state to <code>stdout</code>.
@@ -85,7 +85,7 @@ To run this example, go to the <a href="#run" class="shortcut">Run</a> tab, and
 </p>
 
 <p>
-<a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/persistence.html#event-sourcing" target="_blank">Event sourcing</a>
+<a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/persistence.html#event-sourcing" target="_blank">Event sourcing</a>
 on the other hand, does not persist commands directly but rather events that have been derived from received commands
 (not shown here). These events are known to be successfully applicable to current processor state i.e. there's
 no need for deleting them from the journal. Event sourced processors usually have a lower throughput than command
diff --git a/akka-samples/akka-sample-remote-java/build.sbt b/akka-samples/akka-sample-remote-java/build.sbt
index 235a8a7ec0..76fb58ef75 100644
--- a/akka-samples/akka-sample-remote-java/build.sbt
+++ b/akka-samples/akka-sample-remote-java/build.sbt
@@ -1,12 +1,12 @@
 name := "akka-sample-remote-java"
 
-version := "2.4-SNAPSHOT"
+version := "2.5-SNAPSHOT"
 
 scalaVersion := "2.11.8"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT",
-  "com.typesafe.akka" %% "akka-remote" % "2.4-SNAPSHOT"
+  "com.typesafe.akka" %% "akka-actor" % "2.5-SNAPSHOT",
+  "com.typesafe.akka" %% "akka-remote" % "2.5-SNAPSHOT"
 )
 
 licenses := Seq(("CC0", url("http://creativecommons.org/publicdomain/zero/1.0")))
diff --git a/akka-samples/akka-sample-remote-java/tutorial/index.html b/akka-samples/akka-sample-remote-java/tutorial/index.html
index 45ca1b3ac1..1c7ea8e62f 100644
--- a/akka-samples/akka-sample-remote-java/tutorial/index.html
+++ b/akka-samples/akka-sample-remote-java/tutorial/index.html
@@ -7,7 +7,7 @@
 
 <div>
 <p>
-In order to showcase the <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/remoting.html" target="_blank">remote capabilities of Akka</a>
+In order to showcase the <a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/remoting.html" target="_blank">remote capabilities of Akka</a>
 we thought a remote calculator could do the trick.
 This sample demonstrates both remote deployment and look-up of remote actors.
 </p>
diff --git a/akka-samples/akka-sample-remote-scala/build.sbt b/akka-samples/akka-sample-remote-scala/build.sbt
index cea4fd906b..31f8bb865e 100644
--- a/akka-samples/akka-sample-remote-scala/build.sbt
+++ b/akka-samples/akka-sample-remote-scala/build.sbt
@@ -1,12 +1,12 @@
 name := "akka-sample-remote-scala"
 
-version := "2.4-SNAPSHOT"
+version := "2.5-SNAPSHOT"
 
 scalaVersion := "2.11.8"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-actor" % "2.4-SNAPSHOT",
-  "com.typesafe.akka" %% "akka-remote" % "2.4-SNAPSHOT"
+  "com.typesafe.akka" %% "akka-actor" % "2.5-SNAPSHOT",
+  "com.typesafe.akka" %% "akka-remote" % "2.5-SNAPSHOT"
 )
 
 licenses := Seq(("CC0", url("http://creativecommons.org/publicdomain/zero/1.0")))
diff --git a/akka-samples/akka-sample-remote-scala/tutorial/index.html b/akka-samples/akka-sample-remote-scala/tutorial/index.html
index 952f5e608f..a89e903982 100644
--- a/akka-samples/akka-sample-remote-scala/tutorial/index.html
+++ b/akka-samples/akka-sample-remote-scala/tutorial/index.html
@@ -7,7 +7,7 @@
 
 <div>
 <p>
-In order to showcase the <a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/scala/remoting.html" target="_blank">remote capabilities of Akka</a>
+In order to showcase the <a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/scala/remoting.html" target="_blank">remote capabilities of Akka</a>
 we thought a remote calculator could do the trick.
 This sample demonstrates both remote deployment and look-up of remote actors.
 </p>
diff --git a/akka-samples/akka-sample-supervision-java-lambda/build.sbt b/akka-samples/akka-sample-supervision-java-lambda/build.sbt
index 41d2ebbbd1..95746db778 100644
--- a/akka-samples/akka-sample-supervision-java-lambda/build.sbt
+++ b/akka-samples/akka-sample-supervision-java-lambda/build.sbt
@@ -1,6 +1,6 @@
 name := "akka-sample-supervision-java-lambda"
 
-version := "2.4-SNAPSHOT"
+version := "2.5-SNAPSHOT"
 
 scalaVersion := "2.11.8"
 
@@ -11,8 +11,8 @@ javacOptions in doc ++= Seq("-encoding", "UTF-8", "-source", "1.8", "-Xdoclint:n
 testOptions += Tests.Argument(TestFrameworks.JUnit, "-v", "-a")
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %%      "akka-actor" % "2.4-SNAPSHOT",
-  "com.typesafe.akka" %%    "akka-testkit" % "2.4-SNAPSHOT" % "test",
+  "com.typesafe.akka" %%      "akka-actor" % "2.5-SNAPSHOT",
+  "com.typesafe.akka" %%    "akka-testkit" % "2.5-SNAPSHOT" % "test",
               "junit"  %           "junit" % "4.12"         % "test",
        "com.novocode"  % "junit-interface" % "0.11"         % "test")
 
diff --git a/akka-samples/akka-sample-supervision-java-lambda/pom.xml b/akka-samples/akka-sample-supervision-java-lambda/pom.xml
index 7ab7e78a01..948f331434 100644
--- a/akka-samples/akka-sample-supervision-java-lambda/pom.xml
+++ b/akka-samples/akka-sample-supervision-java-lambda/pom.xml
@@ -11,18 +11,18 @@
   <groupId>sample</groupId>
   <artifactId>akka-sample-supervision-java-lambda</artifactId>
   <packaging>jar</packaging>
-  <version>2.4-SNAPSHOT</version>
+  <version>2.5-SNAPSHOT</version>
 
   <dependencies>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-actor_2.11</artifactId>
-      <version>2.4-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-testkit_2.11</artifactId>
-      <version>2.4-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
diff --git a/akka-samples/akka-sample-supervision-java-lambda/tutorial/index.html b/akka-samples/akka-sample-supervision-java-lambda/tutorial/index.html
index b931c2c0dd..fe3eccf48a 100644
--- a/akka-samples/akka-sample-supervision-java-lambda/tutorial/index.html
+++ b/akka-samples/akka-sample-supervision-java-lambda/tutorial/index.html
@@ -240,10 +240,10 @@ new Divide(
 
     <p>You should also visit</p>
     <ul>
-        <li><a href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java.html"
+        <li><a href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java.html"
                target="_blank">The Akka documentation</a></li>
         <li><a
-               href="http://doc.akka.io/docs/akka/2.4-SNAPSHOT/java/lambda-fault-tolerance.html"
+               href="http://doc.akka.io/docs/akka/2.5-SNAPSHOT/java/lambda-fault-tolerance.html"
                target="_blank">Documentation of supervision</a></li>
         <li><a href="http://letitcrash.com" target="_blank">The Akka Team blog</a></li>
     </ul>
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 8edf97e641..9c4121ae4e 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -34,7 +34,7 @@ object AkkaBuild extends Build {
 
   lazy val buildSettings = Dependencies.Versions ++ Seq(
     organization        := "com.typesafe.akka",
-    version             := "2.4-SNAPSHOT"
+    version             := "2.5-SNAPSHOT"
   )
 
   lazy val rootSettings = parentSettings ++ Release.settings ++