Merged with WordPress trunk r24027.
Merged with WordPress trunk r24028.
Merged with WordPress trunk r24034.
Merged with WordPress trunk r24037.
Merged with WordPress trunk r24038.
Merged with WordPress trunk r24039.