Merge head up to r274519.
Fix wording.