Merging r259177: