Upgrade Saxon 9.6.0-2, close #2380