Merging r260587: