Package upgrade, close #1