Upgrade dependencies, close #1989