Updated granite to latest trunk