Merged with WordPress trunk r24508.