Updates to akka 2.1.4