Upgrade Saxon 9.5.1-4, close #1608