Merge with the latest akka code