Merged with WordPress trunk r24374-r24381.

Excluded modification to wp-admin/includes/schema.php. Since we're not
even to a first official version yet, we don't care about backwards
compatible upgrades.