Merged with WordPress trunk r24433 rr24456.