Merged with WordPress trunk r24022.
Merged with WordPress trunk r24023.
Merged with WordPress trunk r24024.
Merged with WordPress trunk r24025.