Merged with WordPress trunk r24075-r24092.
Merged with WordPress trunk r24093.