Bring v1.60 back to trunk