jjames pushed to cadical (master). "New upstream version."