Upgrade to Akka 2.3.6