Merged with WordPress trunk 24006.