update to r260 from upstream