Merged with WordPress trunk r24010.