Merged with WordPress trunk