Merged with WordPress trunk r24019.
Merged with WordPress trunk r24020.
Merged with WordPress trunk r24021.