Merged with WordPress trunk 24094-24200. Huzzah. That's a big merge.