Merging r260427: