Merged with WordPress trunk r24017.