Merged with WordPress trunk r24251-r24349.

Temporarily caught up with WP development. :)