Upgrade Akka 2.1.3, close #1164