Merged with WordPress trunk r24201.
Merged with WordPress trunk r24203.
Merged with WordPress trunk r24204-r24250.