Merged with WordPress trunk r24400-r24405.