Merged with WordPress trunk r24382-r24396.