Upgrade to Akka 2.1.1